Merge branch 'cfg80211-mac80211-multi-bssid' into mac80211-next (db33aa7e) · Commits · 戴 / test

drivers/net/wireless/mac80211_hwsim.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2801,6 +2801,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
		ieee80211_hw_set(hw, TDLS_WIDER_BW);
		if (rctbl)
		ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);
		ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);

		hw->wiphy->flags \|= WIPHY_FLAG_SUPPORTS_TDLS \|
		WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL \|

include/linux/ieee80211.h

+38 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		* Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
		* Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH
		* Copyright (c) 2016 - 2017 Intel Deutschland GmbH
		* Copyright (c) 2018 Intel Corporation
		* Copyright (c) 2018 - 2019 Intel Corporation
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		@@ -2475,6 +2475,7 @@ enum ieee80211_eid_ext {
		WLAN_EID_EXT_HE_OPERATION = 36,
		WLAN_EID_EXT_UORA = 37,
		WLAN_EID_EXT_HE_MU_EDCA = 38,
		WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,
		};

		/* Action category code */
		@@ -2656,6 +2657,11 @@ enum ieee80211_tdls_actioncode {
		*/
		#define WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING BIT(2)

		/* Multiple BSSID capability is set in the 6th bit of 3rd byte of the
		* @WLAN_EID_EXT_CAPABILITY information element
		*/
		#define WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT BIT(6)

		/* TDLS capabilities in the the 4th byte of @WLAN_EID_EXT_CAPABILITY */
		#define WLAN_EXT_CAPA4_TDLS_BUFFER_STA BIT(4)
		#define WLAN_EXT_CAPA4_TDLS_PEER_PSM BIT(5)
		@@ -2691,6 +2697,9 @@ enum ieee80211_tdls_actioncode {
		#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT BIT(5)
		#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT BIT(6)

		/* Defines support for enhanced multi-bssid advertisement*/
		#define WLAN_EXT_CAPA11_EMA_SUPPORT BIT(1)

		/* TDLS specific payload type in the LLC/SNAP header */
		#define WLAN_TDLS_SNAP_RFTYPE 0x2

		@@ -2882,6 +2891,34 @@ enum ieee80211_sa_query_action {
		WLAN_ACTION_SA_QUERY_RESPONSE = 1,
		};

		/**
		* struct ieee80211_bssid_index
		*
		* This structure refers to "Multiple BSSID-index element"
		*
		* @bssid_index: BSSID index
		* @dtim_period: optional, overrides transmitted BSS dtim period
		* @dtim_count: optional, overrides transmitted BSS dtim count
		*/
		struct ieee80211_bssid_index {
		u8 bssid_index;
		u8 dtim_period;
		u8 dtim_count;
		};

		/**
		* struct ieee80211_multiple_bssid_configuration
		*
		* This structure refers to "Multiple BSSID Configuration element"
		*
		* @bssid_count: total number of active BSSIDs in the set
		* @profile_periodicity: the least number of beacon frames need to be received
		* in order to discover all the nontransmitted BSSIDs in the set.
		*/
		struct ieee80211_multiple_bssid_configuration {
		u8 bssid_count;
		u8 profile_periodicity;
		};

		#define SUITE(oui, id) (((oui) << 8) \| (id))

include/net/cfg80211.h

+43 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
		* Copyright 2013-2014 Intel Mobile Communications GmbH
		* Copyright 2015-2017 Intel Deutschland GmbH
		* Copyright (C) 2018 Intel Corporation
		* Copyright (C) 2018-2019 Intel Corporation
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		@@ -2035,9 +2035,15 @@ struct cfg80211_bss_ies {
		* a BSS that hides the SSID in its beacon, this points to the BSS struct
		* that holds the beacon data. @beacon_ies is still valid, of course, and
		* points to the same data as hidden_beacon_bss->beacon_ies in that case.
		* @transmitted_bss: pointer to the transmitted BSS, if this is a
		* non-transmitted one (multi-BSSID support)
		* @nontrans_list: list of non-transmitted BSS, if this is a transmitted one
		* (multi-BSSID support)
		* @signal: signal strength value (type depends on the wiphy's signal_type)
		* @chains: bitmask for filled values in @chain_signal.
		* @chain_signal: per-chain signal strength of last received BSS in dBm.
		* @bssid_index: index in the multiple BSS set
		* @max_bssid_indicator: max number of members in the BSS set
		* @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
		*/
		struct cfg80211_bss {
		@@ -2049,6 +2055,8 @@ struct cfg80211_bss {
		const struct cfg80211_bss_ies __rcu *proberesp_ies;

		struct cfg80211_bss *hidden_beacon_bss;
		struct cfg80211_bss *transmitted_bss;
		struct list_head nontrans_list;

		s32 signal;

		@@ -2059,6 +2067,9 @@ struct cfg80211_bss {
		u8 chains;
		s8 chain_signal[IEEE80211_MAX_CHAINS];

		u8 bssid_index;
		u8 max_bssid_indicator;

		u8 priv[0] __aligned(sizeof(void *));
		};

		@@ -4313,6 +4324,11 @@ struct cfg80211_pmsr_capabilities {
		* @txq_memory_limit: configuration internal TX queue memory limit
		* @txq_quantum: configuration of internal TX queue scheduler quantum
		*
		* @support_mbssid: can HW support association with nontransmitted AP
		* @support_only_he_mbssid: don't parse MBSSID elements if it is not
		* HE AP, in order to avoid compatibility issues.
		* @support_mbssid must be set for this to have any effect.
		*
		* @pmsr_capa: peer measurement capabilities
		*/
		struct wiphy {
		@@ -4453,6 +4469,9 @@ struct wiphy {
		u32 txq_memory_limit;
		u32 txq_quantum;

		u8 support_mbssid:1,
		support_only_he_mbssid:1;

		const struct cfg80211_pmsr_capabilities *pmsr_capa;

		char priv[0] __aligned(NETDEV_ALIGN);
		@@ -5451,6 +5470,29 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
		return cfg80211_inform_bss_frame_data(wiphy, &data, mgmt, len, gfp);
		}

		/**
		* cfg80211_gen_new_bssid - generate a nontransmitted BSSID for multi-BSSID
		* @bssid: transmitter BSSID
		* @max_bssid: max BSSID indicator, taken from Multiple BSSID element
		* @mbssid_index: BSSID index, taken from Multiple BSSID index element
		* @new_bssid_addr: address of the resulting BSSID
		*/
		static inline void cfg80211_gen_new_bssid(const u8 *bssid, u8 max_bssid,
		u8 mbssid_index, u8 *new_bssid_addr)
		{
		u64 bssid_tmp, new_bssid;
		u64 lsb_n;

		bssid_tmp = ether_addr_to_u64(bssid);

		lsb_n = bssid_tmp & ((1 << max_bssid) - 1);
		new_bssid = bssid_tmp;
		new_bssid &= ~((1 << max_bssid) - 1);
		new_bssid \|= (lsb_n + mbssid_index) % (1 << max_bssid);

		u64_to_ether_addr(new_bssid, new_bssid_addr);
		}

		/**
		* enum cfg80211_bss_frame_type - frame type that the BSS data came from
		* @CFG80211_BSS_FTYPE_UNKNOWN: driver doesn't know whether the data is

include/net/mac80211.h

+22 −0

Original line number	Diff line number	Diff line
		@@ -591,6 +591,14 @@ struct ieee80211_ftm_responder_params {
		* @ftm_responder: whether to enable or disable fine timing measurement FTM
		* responder functionality.
		* @ftmr_params: configurable lci/civic parameter when enabling FTM responder.
		* @nontransmitted: this BSS is a nontransmitted BSS profile
		* @transmitter_bssid: the address of transmitter AP
		* @bssid_index: index inside the multiple BSSID set
		* @bssid_indicator: 2^bssid_indicator is the maximum number of APs in set
		* @ema_ap: AP supports enhancements of discovery and advertisement of
		* nontransmitted BSSIDs
		* @profile_periodicity: the least number of beacon frames need to be received
		* in order to discover all the nontransmitted BSSIDs in the set.
		*/
		struct ieee80211_bss_conf {
		const u8 *bssid;
		@@ -644,6 +652,13 @@ struct ieee80211_bss_conf {
		bool protected_keep_alive;
		bool ftm_responder;
		struct ieee80211_ftm_responder_params *ftmr_params;
		/* Multiple BSSID data */
		bool nontransmitted;
		u8 transmitter_bssid[ETH_ALEN];
		u8 bssid_index;
		u8 bssid_indicator;
		bool ema_ap;
		u8 profile_periodicity;
		};

		/**
		@@ -2219,6 +2234,11 @@ struct ieee80211_txq {
		* @IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN: Driver does not report accurate A-MPDU
		* length in tx status information
		*
		* @IEEE80211_HW_SUPPORTS_MULTI_BSSID: Hardware supports multi BSSID
		*
		* @IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID: Hardware supports multi BSSID
		* only for HE APs. Applies if @IEEE80211_HW_SUPPORTS_MULTI_BSSID is set.
		*
		* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
		*/
		enum ieee80211_hw_flags {
		@@ -2268,6 +2288,8 @@ enum ieee80211_hw_flags {
		IEEE80211_HW_SUPPORTS_VHT_EXT_NSS_BW,
		IEEE80211_HW_STA_MMPDU_TXQ,
		IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN,
		IEEE80211_HW_SUPPORTS_MULTI_BSSID,
		IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID,

		/* keep last, obviously */
		NUM_IEEE80211_HW_FLAGS

net/mac80211/debugfs.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
		* Copyright 2013-2014 Intel Mobile Communications GmbH
		* Copyright (C) 2018 Intel Corporation
		* Copyright (C) 2018 - 2019 Intel Corporation
		*
		* GPLv2
		*
		@@ -219,6 +219,8 @@ static const char *hw_flag_names[] = {
		FLAG(SUPPORTS_VHT_EXT_NSS_BW),
		FLAG(STA_MMPDU_TXQ),
		FLAG(TX_STATUS_NO_AMPDU_LEN),
		FLAG(SUPPORTS_MULTI_BSSID),
		FLAG(SUPPORTS_ONLY_HE_MULTI_BSSID),
		#undef FLAG
		};

Admin message