From patchwork Fri Dec 13 15:58:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 11291705 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A43C14BD for ; Fri, 13 Dec 2019 22:25:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7FBC7214D8 for ; Fri, 13 Dec 2019 22:25:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HoIu0s3Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FBC7214D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=phrozen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cfeu1OegPKmQZ8f1yzsGXksaPwWwPQ7LBOpSyEqpN1M=; b=HoIu0s3YECAX2Q +KM876bJY6Ouwt02HSvmK/32I5uYDDWJLJrMgJ9NsY5XwWJIXsRlRIK9IGQj30le53wRN301yUwW8 bBYGt2YjOwEzyMAO0fpMYxOC1D+m6N6LyETg3IRP+WsLKQakPXZ7ZA86wSPOQOES/61eGl8+nYPfY pL0MaJxCf83l+CBiox0wiDv5xkBwTMV9H3LgsBK5zCY/T1/eOL26pPvhoe8HM3vo+M94veFT8wiFv QchDAUqNGYoXyHvMadWsS4VzRlK7Fqbjev94Zi/PIV2kWxSxCHidErv1evdAKmkuYQglAhPxvNPtx x1TCVOHdc3Cr7EiYzZhw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifnKg-0007KN-A2; Fri, 13 Dec 2019 15:58:22 +0000 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 Received: from pd95fd344.dip0.t-ipconnect.de ([217.95.211.68] helo=bertha.fritz.box) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1ifnKV-00073u-DD; Fri, 13 Dec 2019 16:58:11 +0100 From: John Crispin To: Johannes Berg , Kalle Valo 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> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191213155802.25491-1-john@phrozen.org> References: <20191213155802.25491-1-john@phrozen.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191213_075815_923626_AE0B4A58 X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, John Crispin Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org 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);