Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2873399pxu; Sun, 29 Nov 2020 07:33:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVtgvUebBOLKEXcaRQeaE/EXkvG54le0yQPF6XpPbKSsz4x4/YCg3obdOrtS9kBb6VQ9oL X-Received: by 2002:a17:906:6715:: with SMTP id a21mr2403860ejp.330.1606664013114; Sun, 29 Nov 2020 07:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606664013; cv=none; d=google.com; s=arc-20160816; b=nkNRdR+QvcpKbp8dzl2vLo9V7W78kOFoFI66xbWbQdIQYU5be0peMx7p4pVnXCrHTU AVysP/wNOJ6ziExr6OBuvDf/95A3yqZ59WcgZ6fCdetOXoXJWqWuPEpNzImXcz0sJDDm xN+lwEg2ox9gX107+sttgCys075r5kfyDKytBRaUtofEAlGTYH2pgUy8Dxw3ZhzvObdW cz/fKqE6WzMxPBKoNYvWuWVyTXD4YJTw8exnMGFCqtpRd1Tzi5OcVlUdLbJXe9SBgHgI A9dh0ghv1mhqcdFd2/WA9OZIglCjfREcrUPF+NuDdl1jj8gAq/OWQA2ef7Da+FgrymHg qRTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=St3S+ULHj8bNcCy4HAbyg5qdYECCwrs+K3gg5iFuvhc=; b=DRHb+ZvkPjA8JMaOcpGTnSfFQfX4wv7GwU3n7K5lJNaW+NawS+r4kPsDCHAIB9yNDD UpDmZ/RwN9nJ8AN1qE02E0s/YHb/OlmCjpMPVyYSCWogQijRcY5K9YVxTn9G/23MfTKy Eu/NdPn7r4eykJ5myVcYdPcuBVm6zsfBWtiKSyE18nCVg/ApRu61l5Wv0sLlPSCDQLeL ghyPKnxtVsc+qHhcAWgcexS7vLfjflVabQtaC3HZUshJl2/mw3Ez7fbrpDHiXmAlg07C +vQnTEywnnrkBpxM+wjImjmMCAO02cHqtD6kCKigReM8GKP/AP6wZZ9d9Kr0taB+8oYk qLzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cf13si7050323ejb.317.2020.11.29.07.32.57; Sun, 29 Nov 2020 07:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727676AbgK2Pbq (ORCPT + 99 others); Sun, 29 Nov 2020 10:31:46 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:33510 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726462AbgK2Pbp (ORCPT ); Sun, 29 Nov 2020 10:31:45 -0500 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjOfC-0035ld-Ep; Sun, 29 Nov 2020 17:30:59 +0200 From: Luca Coelho To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Date: Sun, 29 Nov 2020 17:30:43 +0200 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201129153055.1971298-1-luca@coelho.fi> References: <20201129153055.1971298-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH 01/13] mac80211: he: remove non-bss-conf fields from bss_conf Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Shaul Triebitz ack_enabled and multi_sta_back_32bit are station capabilities and should not be in the bss_conf structure. Signed-off-by: Shaul Triebitz Signed-off-by: Luca Coelho --- include/net/mac80211.h | 2 -- net/mac80211/mlme.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 05c7524bab26..1328b7166460 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -635,9 +635,7 @@ struct ieee80211_fils_discovery { struct ieee80211_bss_conf { const u8 *bssid; u8 htc_trig_based_pkt_ext; - bool multi_sta_back_32bit; bool uora_exists; - bool ack_enabled; u8 uora_ocw_range; u16 frame_time_rts_th; bool he_support; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 6adfcb9c06dc..b0afb61d9e84 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3494,14 +3494,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, le32_get_bits(elems->he_operation->he_oper_params, IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK); - bss_conf->multi_sta_back_32bit = - sta->sta.he_cap.he_cap_elem.mac_cap_info[2] & - IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP; - - bss_conf->ack_enabled = - sta->sta.he_cap.he_cap_elem.mac_cap_info[2] & - IEEE80211_HE_MAC_CAP2_ACK_EN; - bss_conf->uora_exists = !!elems->uora_element; if (elems->uora_element) bss_conf->uora_ocw_range = elems->uora_element[0]; -- 2.29.2