forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mac80211-next-for-net-next-2021-06-25' of git://git.kernel…
….org/pub/scm/linux/kernel/git/jberg/mac80211-next Johannes berg says: ==================== Lots of changes: * aggregation handling improvements for some drivers * hidden AP discovery on 6 GHz and other HE 6 GHz improvements * minstrel improvements for no-ack frames * deferred rate control for TXQs to improve reaction times * virtual time-based airtime scheduler * along with various little cleanups/fixups ==================== Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
47 changed files
with
1,492 additions
and
786 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| * Copyright (c) 2006, Michael Wu <[email protected]> | ||
| * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH | ||
| * Copyright (c) 2016 - 2017 Intel Deutschland GmbH | ||
| * Copyright (c) 2018 - 2020 Intel Corporation | ||
| * Copyright (c) 2018 - 2021 Intel Corporation | ||
| */ | ||
|
|
||
| #ifndef LINUX_IEEE80211_H | ||
|
|
@@ -2179,6 +2179,8 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap, | |
| #define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED 0xc0 | ||
| #define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK 0xc0 | ||
|
|
||
| #define IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF 0x01 | ||
|
|
||
| /* 802.11ax HE TX/RX MCS NSS Support */ | ||
| #define IEEE80211_TX_RX_MCS_NSS_SUPP_HIGHEST_MCS_POS (3) | ||
| #define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_POS (6) | ||
|
|
@@ -2933,6 +2935,7 @@ enum ieee80211_category { | |
| WLAN_CATEGORY_BACK = 3, | ||
| WLAN_CATEGORY_PUBLIC = 4, | ||
| WLAN_CATEGORY_RADIO_MEASUREMENT = 5, | ||
| WLAN_CATEGORY_FAST_BBS_TRANSITION = 6, | ||
| WLAN_CATEGORY_HT = 7, | ||
| WLAN_CATEGORY_SA_QUERY = 8, | ||
| WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9, | ||
|
|
@@ -3110,6 +3113,11 @@ enum ieee80211_tdls_actioncode { | |
| */ | ||
| #define WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT BIT(6) | ||
|
|
||
| /* Timing Measurement protocol for time sync is set in the 7th bit of 3rd byte | ||
| * of the @WLAN_EID_EXT_CAPABILITY information element | ||
| */ | ||
| #define WLAN_EXT_CAPA3_TIMING_MEASUREMENT_SUPPORT BIT(7) | ||
|
|
||
| /* TDLS capabilities in 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) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ | |
| * Copyright 2006-2010 Johannes Berg <[email protected]> | ||
| * Copyright 2013-2014 Intel Mobile Communications GmbH | ||
| * Copyright 2015-2017 Intel Deutschland GmbH | ||
| * Copyright (C) 2018-2020 Intel Corporation | ||
| * Copyright (C) 2018-2021 Intel Corporation | ||
| */ | ||
|
|
||
| #include <linux/ethtool.h> | ||
|
|
@@ -22,6 +22,7 @@ | |
| #include <linux/if_ether.h> | ||
| #include <linux/ieee80211.h> | ||
| #include <linux/net.h> | ||
| #include <linux/rfkill.h> | ||
| #include <net/regulatory.h> | ||
|
|
||
| /** | ||
|
|
@@ -370,11 +371,18 @@ struct ieee80211_sta_he_cap { | |
| * @he_cap: holds the HE capabilities | ||
| * @he_6ghz_capa: HE 6 GHz capabilities, must be filled in for a | ||
| * 6 GHz band channel (and 0 may be valid value). | ||
| * @vendor_elems: vendor element(s) to advertise | ||
| * @vendor_elems.data: vendor element(s) data | ||
| * @vendor_elems.len: vendor element(s) length | ||
| */ | ||
| struct ieee80211_sband_iftype_data { | ||
| u16 types_mask; | ||
| struct ieee80211_sta_he_cap he_cap; | ||
| struct ieee80211_he_6ghz_capa he_6ghz_capa; | ||
| struct { | ||
| const u8 *data; | ||
| unsigned int len; | ||
| } vendor_elems; | ||
| }; | ||
|
|
||
| /** | ||
|
|
@@ -533,18 +541,6 @@ ieee80211_get_he_iftype_cap(const struct ieee80211_supported_band *sband, | |
| return NULL; | ||
| } | ||
|
|
||
| /** | ||
| * ieee80211_get_he_sta_cap - return HE capabilities for an sband's STA | ||
| * @sband: the sband to search for the STA on | ||
| * | ||
| * Return: pointer to the struct ieee80211_sta_he_cap, or NULL is none found | ||
| */ | ||
| static inline const struct ieee80211_sta_he_cap * | ||
| ieee80211_get_he_sta_cap(const struct ieee80211_supported_band *sband) | ||
| { | ||
| return ieee80211_get_he_iftype_cap(sband, NL80211_IFTYPE_STATION); | ||
| } | ||
|
|
||
| /** | ||
| * ieee80211_get_he_6ghz_capa - return HE 6 GHz capabilities | ||
| * @sband: the sband to search for the STA on | ||
|
|
@@ -905,6 +901,17 @@ ieee80211_chandef_max_power(struct cfg80211_chan_def *chandef) | |
| return chandef->chan->max_power; | ||
| } | ||
|
|
||
| /** | ||
| * cfg80211_any_usable_channels - check for usable channels | ||
| * @wiphy: the wiphy to check for | ||
| * @band_mask: which bands to check on | ||
| * @prohibited_flags: which channels to not consider usable, | ||
| * %IEEE80211_CHAN_DISABLED is always taken into account | ||
| */ | ||
| bool cfg80211_any_usable_channels(struct wiphy *wiphy, | ||
| unsigned long band_mask, | ||
| u32 prohibited_flags); | ||
|
|
||
| /** | ||
| * enum survey_info_flags - survey information flags | ||
| * | ||
|
|
@@ -1245,8 +1252,6 @@ struct cfg80211_csa_settings { | |
| u8 count; | ||
| }; | ||
|
|
||
| #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10 | ||
|
|
||
| /** | ||
| * struct iface_combination_params - input parameters for interface combinations | ||
| * | ||
|
|
@@ -3522,7 +3527,10 @@ struct cfg80211_pmsr_result { | |
| * If neither @trigger_based nor @non_trigger_based is set, | ||
| * EDCA based ranging will be used. | ||
| * @lmr_feedback: negotiate for I2R LMR feedback. Only valid if either | ||
| * @trigger_based or @non_trigger_based is set. | ||
| * @trigger_based or @non_trigger_based is set. | ||
| * @bss_color: the bss color of the responder. Optional. Set to zero to | ||
| * indicate the driver should set the BSS color. Only valid if | ||
| * @non_trigger_based or @trigger_based is set. | ||
| * | ||
| * See also nl80211 for the respective attribute documentation. | ||
| */ | ||
|
|
@@ -3540,6 +3548,7 @@ struct cfg80211_pmsr_ftm_request_peer { | |
| u8 burst_duration; | ||
| u8 ftms_per_burst; | ||
| u8 ftmr_retries; | ||
| u8 bss_color; | ||
| }; | ||
|
|
||
| /** | ||
|
|
@@ -4945,6 +4954,7 @@ struct wiphy_iftype_akm_suites { | |
| * configuration through the %NL80211_TID_CONFIG_ATTR_RETRY_SHORT and | ||
| * %NL80211_TID_CONFIG_ATTR_RETRY_LONG attributes | ||
| * @sar_capa: SAR control capabilities | ||
| * @rfkill: a pointer to the rfkill structure | ||
| */ | ||
| struct wiphy { | ||
| struct mutex mtx; | ||
|
|
@@ -5087,6 +5097,8 @@ struct wiphy { | |
|
|
||
| const struct cfg80211_sar_capa *sar_capa; | ||
|
|
||
| struct rfkill *rfkill; | ||
|
|
||
| char priv[] __aligned(NETDEV_ALIGN); | ||
| }; | ||
|
|
||
|
|
@@ -6661,7 +6673,10 @@ void wiphy_rfkill_start_polling(struct wiphy *wiphy); | |
| * wiphy_rfkill_stop_polling - stop polling rfkill | ||
| * @wiphy: the wiphy | ||
| */ | ||
| void wiphy_rfkill_stop_polling(struct wiphy *wiphy); | ||
| static inline void wiphy_rfkill_stop_polling(struct wiphy *wiphy) | ||
| { | ||
| rfkill_pause_polling(wiphy->rfkill); | ||
| } | ||
|
|
||
| /** | ||
| * DOC: Vendor commands | ||
|
|
||
Oops, something went wrong.