From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifnKZ-0007EC-Nc for ath11k@lists.infradead.org; Fri, 13 Dec 2019 15:58:18 +0000 From: John Crispin Subject: [PATCH v2 5/7] mac80211: drop now unused bss_color element Date: Fri, 13 Dec 2019 16:58:00 +0100 Message-Id: <20191213155802.25491-5-john@phrozen.org> In-Reply-To: <20191213155802.25491-1-john@phrozen.org> References: <20191213155802.25491-1-john@phrozen.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ath11k" Errors-To: ath11k-bounces+kvalo=adurom.com@lists.infradead.org To: Johannes Berg , Kalle Valo Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, John Crispin With all users of bss_color converted we can drop the old element. Driver code should now use the new he_bss_color struct. Signed-off-by: John Crispin --- include/net/mac80211.h | 2 -- net/mac80211/mlme.c | 1 - 2 files changed, 3 deletions(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 994686443553..9a67fd2cfe4b 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -496,7 +496,6 @@ struct ieee80211_ftm_responder_params { * This structure keeps information about a BSS (and an association * to that BSS) that can change during the lifetime of the BSS. * - * @bss_color: 6-bit value to mark inter-BSS frame, if BSS supports HE * @htc_trig_based_pkt_ext: default PE in 4us units, if BSS supports HE * @multi_sta_back_32bit: supports BA bitmap of 32-bits in Multi-STA BACK * @uora_exists: is the UORA element advertised by AP @@ -610,7 +609,6 @@ struct ieee80211_ftm_responder_params { */ struct ieee80211_bss_conf { const u8 *bssid; - u8 bss_color; u8 htc_trig_based_pkt_ext; bool multi_sta_back_32bit; bool uora_exists; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 319d43f4082b..bc602d460b73 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3371,7 +3371,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, } if (bss_conf->he_support) { - bss_conf->bss_color = bss_conf->he_bss_color.color = le32_get_bits(elems.he_operation->he_oper_params, IEEE80211_HE_OPERATION_BSS_COLOR_MASK); -- 2.20.1 _______________________________________________ ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k