mac80211: refresh regular mac80211 patches
This commit is contained in:
		@@ -82,7 +82,7 @@
 | 
			
		||||
 	help
 | 
			
		||||
--- a/local-symbols
 | 
			
		||||
+++ b/local-symbols
 | 
			
		||||
@@ -94,6 +94,7 @@ ADM8211=
 | 
			
		||||
@@ -95,6 +95,7 @@ ADM8211=
 | 
			
		||||
 ATH_COMMON=
 | 
			
		||||
 WLAN_VENDOR_ATH=
 | 
			
		||||
 ATH_DEBUG=
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,7 @@
 | 
			
		||||
 void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);
 | 
			
		||||
--- a/local-symbols
 | 
			
		||||
+++ b/local-symbols
 | 
			
		||||
@@ -153,6 +153,7 @@ ATH10K_SNOC=
 | 
			
		||||
@@ -154,6 +154,7 @@ ATH10K_SNOC=
 | 
			
		||||
 ATH10K_DEBUG=
 | 
			
		||||
 ATH10K_DEBUGFS=
 | 
			
		||||
 ATH10K_SPECTRAL=
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
--- a/drivers/net/wireless/ath/ath10k/mac.c
 | 
			
		||||
+++ b/drivers/net/wireless/ath/ath10k/mac.c
 | 
			
		||||
@@ -9918,6 +9918,21 @@ static int ath10k_mac_init_rd(struct ath
 | 
			
		||||
@@ -9920,6 +9920,21 @@ static int ath10k_mac_init_rd(struct ath
 | 
			
		||||
 	return 0;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@
 | 
			
		||||
 int ath10k_mac_register(struct ath10k *ar)
 | 
			
		||||
 {
 | 
			
		||||
 	static const u32 cipher_suites[] = {
 | 
			
		||||
@@ -10276,6 +10291,12 @@ int ath10k_mac_register(struct ath10k *a
 | 
			
		||||
@@ -10278,6 +10293,12 @@ int ath10k_mac_register(struct ath10k *a
 | 
			
		||||
 
 | 
			
		||||
 	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -114,7 +114,7 @@ v13:
 | 
			
		||||
 ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o
 | 
			
		||||
--- a/local-symbols
 | 
			
		||||
+++ b/local-symbols
 | 
			
		||||
@@ -154,6 +154,7 @@ ATH10K_DEBUG=
 | 
			
		||||
@@ -155,6 +155,7 @@ ATH10K_DEBUG=
 | 
			
		||||
 ATH10K_DEBUGFS=
 | 
			
		||||
 ATH10K_SPECTRAL=
 | 
			
		||||
 ATH10K_THERMAL=
 | 
			
		||||
 
 | 
			
		||||
@@ -42,7 +42,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
 | 
			
		||||
 	if (ret)
 | 
			
		||||
--- a/drivers/net/wireless/ath/ath10k/mac.c
 | 
			
		||||
+++ b/drivers/net/wireless/ath/ath10k/mac.c
 | 
			
		||||
@@ -10293,7 +10293,7 @@ int ath10k_mac_register(struct ath10k *a
 | 
			
		||||
@@ -10295,7 +10295,7 @@ int ath10k_mac_register(struct ath10k *a
 | 
			
		||||
 	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
 | 
			
		||||
 
 | 
			
		||||
 #ifdef CPTCFG_MAC80211_LEDS
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
			
		||||
 | 
			
		||||
--- a/drivers/net/wireless/ath/ath10k/mac.c
 | 
			
		||||
+++ b/drivers/net/wireless/ath/ath10k/mac.c
 | 
			
		||||
@@ -10089,7 +10089,6 @@ int ath10k_mac_register(struct ath10k *a
 | 
			
		||||
@@ -10091,7 +10091,6 @@ int ath10k_mac_register(struct ath10k *a
 | 
			
		||||
 	ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
 | 
			
		||||
 	ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
 | 
			
		||||
 	ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);
 | 
			
		||||
 
 | 
			
		||||
@@ -56,7 +56,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 | 
			
		||||
 int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state);
 | 
			
		||||
--- a/local-symbols
 | 
			
		||||
+++ b/local-symbols
 | 
			
		||||
@@ -166,6 +166,7 @@ ATH11K_DEBUG=
 | 
			
		||||
@@ -167,6 +167,7 @@ ATH11K_DEBUG=
 | 
			
		||||
 ATH11K_DEBUGFS=
 | 
			
		||||
 ATH11K_TRACING=
 | 
			
		||||
 ATH11K_SPECTRAL=
 | 
			
		||||
 
 | 
			
		||||
@@ -271,7 +271,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
 | 
			
		||||
 #endif
 | 
			
		||||
--- a/drivers/net/wireless/ath/ath11k/wmi.c
 | 
			
		||||
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
 | 
			
		||||
@@ -6996,24 +6996,12 @@ static void ath11k_wmi_htc_tx_complete(s
 | 
			
		||||
@@ -6998,24 +6998,12 @@ static void ath11k_wmi_htc_tx_complete(s
 | 
			
		||||
 		wake_up(&wmi->tx_ce_desc_wq);
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -296,7 +296,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
 | 
			
		||||
 	int ret = 0, pdev_idx, i, j;
 | 
			
		||||
 	struct ath11k *ar;
 | 
			
		||||
 
 | 
			
		||||
@@ -7075,17 +7063,7 @@ static int ath11k_reg_chan_list_event(st
 | 
			
		||||
@@ -7077,17 +7065,7 @@ static int ath11k_reg_chan_list_event(st
 | 
			
		||||
 		    (char *)reg_info->alpha2, 2))
 | 
			
		||||
 		goto mem_free;
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -371,7 +371,7 @@
 | 
			
		||||
 
 | 
			
		||||
--- a/local-symbols
 | 
			
		||||
+++ b/local-symbols
 | 
			
		||||
@@ -121,6 +121,7 @@ ATH9K_WOW=
 | 
			
		||||
@@ -122,6 +122,7 @@ ATH9K_WOW=
 | 
			
		||||
 ATH9K_RFKILL=
 | 
			
		||||
 ATH9K_CHANNEL_CONTEXT=
 | 
			
		||||
 ATH9K_PCOEM=
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
--- a/local-symbols
 | 
			
		||||
+++ b/local-symbols
 | 
			
		||||
@@ -339,6 +339,7 @@ RT2X00_LIB_FIRMWARE=
 | 
			
		||||
@@ -340,6 +340,7 @@ RT2X00_LIB_FIRMWARE=
 | 
			
		||||
 RT2X00_LIB_CRYPTO=
 | 
			
		||||
 RT2X00_LIB_LEDS=
 | 
			
		||||
 RT2X00_LIB_DEBUGFS=
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
			
		||||
 			struct rx_packet_hdr *rx_hdr;
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -6324,11 +6324,36 @@ static inline int ieee80211_data_to_8023
 | 
			
		||||
@@ -6326,11 +6326,36 @@ static inline int ieee80211_data_to_8023
 | 
			
		||||
  * @extra_headroom: The hardware extra headroom for SKBs in the @list.
 | 
			
		||||
  * @check_da: DA to check in the inner ethernet header, or NULL
 | 
			
		||||
  * @check_sa: SA to check in the inner ethernet header, or NULL
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
			
		||||
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -6310,6 +6310,19 @@ static inline int ieee80211_data_to_8023
 | 
			
		||||
@@ -6312,6 +6312,19 @@ static inline int ieee80211_data_to_8023
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
 /**
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -7836,6 +7836,8 @@ void cfg80211_roamed(struct net_device *
 | 
			
		||||
@@ -7838,6 +7838,8 @@ void cfg80211_roamed(struct net_device *
 | 
			
		||||
  *
 | 
			
		||||
  * @dev: network device
 | 
			
		||||
  * @bssid: the BSSID of the AP
 | 
			
		||||
@@ -46,7 +46,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
  * @gfp: allocation flags
 | 
			
		||||
  *
 | 
			
		||||
  * This function should be called by a driver that supports 4 way handshake
 | 
			
		||||
@@ -7846,7 +7848,7 @@ void cfg80211_roamed(struct net_device *
 | 
			
		||||
@@ -7848,7 +7850,7 @@ void cfg80211_roamed(struct net_device *
 | 
			
		||||
  * indicate the 802.11 association.
 | 
			
		||||
  */
 | 
			
		||||
 void cfg80211_port_authorized(struct net_device *dev, const u8 *bssid,
 | 
			
		||||
 
 | 
			
		||||
@@ -157,7 +157,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		return STA_STATS_RATE_INVALID;
 | 
			
		||||
--- a/net/mac80211/util.c
 | 
			
		||||
+++ b/net/mac80211/util.c
 | 
			
		||||
@@ -3898,6 +3898,19 @@ u64 ieee80211_calculate_rx_timestamp(str
 | 
			
		||||
@@ -3892,6 +3892,19 @@ u64 ieee80211_calculate_rx_timestamp(str
 | 
			
		||||
 
 | 
			
		||||
 	/* Fill cfg80211 rate info */
 | 
			
		||||
 	switch (status->encoding) {
 | 
			
		||||
 
 | 
			
		||||
@@ -263,7 +263,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		} else {
 | 
			
		||||
 			bss_conf->eht_support = false;
 | 
			
		||||
 		}
 | 
			
		||||
@@ -5452,6 +5588,45 @@ static bool ieee80211_rx_our_beacon(cons
 | 
			
		||||
@@ -5456,6 +5592,45 @@ static bool ieee80211_rx_our_beacon(cons
 | 
			
		||||
 	return ether_addr_equal(tx_bssid, bss->transmitted_bss->bssid);
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -309,7 +309,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link,
 | 
			
		||||
 				     struct ieee80211_hdr *hdr, size_t len,
 | 
			
		||||
 				     struct ieee80211_rx_status *rx_status)
 | 
			
		||||
@@ -5468,7 +5643,7 @@ static void ieee80211_rx_mgmt_beacon(str
 | 
			
		||||
@@ -5472,7 +5647,7 @@ static void ieee80211_rx_mgmt_beacon(str
 | 
			
		||||
 	struct ieee80211_channel *chan;
 | 
			
		||||
 	struct link_sta_info *link_sta;
 | 
			
		||||
 	struct sta_info *sta;
 | 
			
		||||
@@ -318,7 +318,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 	bool erp_valid;
 | 
			
		||||
 	u8 erp_value = 0;
 | 
			
		||||
 	u32 ncrc = 0;
 | 
			
		||||
@@ -5761,6 +5936,21 @@ static void ieee80211_rx_mgmt_beacon(str
 | 
			
		||||
@@ -5765,6 +5940,21 @@ static void ieee80211_rx_mgmt_beacon(str
 | 
			
		||||
 					       elems->pwr_constr_elem,
 | 
			
		||||
 					       elems->cisco_dtpc_elem);
 | 
			
		||||
 
 | 
			
		||||
@@ -340,7 +340,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 	ieee80211_link_info_change_notify(sdata, link, changed);
 | 
			
		||||
 free:
 | 
			
		||||
 	kfree(elems);
 | 
			
		||||
@@ -6862,9 +7052,12 @@ ieee80211_setup_assoc_link(struct ieee80
 | 
			
		||||
@@ -6866,9 +7056,12 @@ ieee80211_setup_assoc_link(struct ieee80
 | 
			
		||||
 		ieee80211_apply_htcap_overrides(sdata, &sta_ht_cap);
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
@@ -353,7 +353,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		const struct element *elem;
 | 
			
		||||
 		u8 dtim_count = 0;
 | 
			
		||||
 
 | 
			
		||||
@@ -6893,6 +7086,31 @@ ieee80211_setup_assoc_link(struct ieee80
 | 
			
		||||
@@ -6897,6 +7090,31 @@ ieee80211_setup_assoc_link(struct ieee80
 | 
			
		||||
 			link->conf->ema_ap = true;
 | 
			
		||||
 		else
 | 
			
		||||
 			link->conf->ema_ap = false;
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -9067,4 +9067,16 @@ static inline int cfg80211_color_change_
 | 
			
		||||
@@ -9069,4 +9069,16 @@ static inline int cfg80211_color_change_
 | 
			
		||||
 					 0, 0);
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -120,7 +120,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			break;
 | 
			
		||||
 		link->u.mgd.conn_flags |=
 | 
			
		||||
 			ieee80211_chandef_downgrade(chandef);
 | 
			
		||||
@@ -5613,8 +5552,8 @@ static bool ieee80211_config_puncturing(
 | 
			
		||||
@@ -5617,8 +5556,8 @@ static bool ieee80211_config_puncturing(
 | 
			
		||||
 	    extracted == link->conf->eht_puncturing)
 | 
			
		||||
 		return true;
 | 
			
		||||
 
 | 
			
		||||
@@ -131,7 +131,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		link_info(link,
 | 
			
		||||
 			  "Got an invalid disable subchannel bitmap from AP %pM: bitmap = 0x%x, bw = 0x%x. disconnect\n",
 | 
			
		||||
 			  link->u.mgd.bssid,
 | 
			
		||||
@@ -7102,8 +7041,8 @@ ieee80211_setup_assoc_link(struct ieee80
 | 
			
		||||
@@ -7106,8 +7045,8 @@ ieee80211_setup_assoc_link(struct ieee80
 | 
			
		||||
 			u16 bitmap;
 | 
			
		||||
 
 | 
			
		||||
 			bitmap = get_unaligned_le16(disable_subchannel_bitmap);
 | 
			
		||||
 
 | 
			
		||||
@@ -28,7 +28,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -1333,6 +1333,9 @@ struct cfg80211_unsol_bcast_probe_resp {
 | 
			
		||||
@@ -1335,6 +1335,9 @@ struct cfg80211_unsol_bcast_probe_resp {
 | 
			
		||||
  * @fils_discovery: FILS discovery transmission parameters
 | 
			
		||||
  * @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters
 | 
			
		||||
  * @mbssid_config: AP settings for multiple bssid
 | 
			
		||||
@@ -38,7 +38,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
  */
 | 
			
		||||
 struct cfg80211_ap_settings {
 | 
			
		||||
 	struct cfg80211_chan_def chandef;
 | 
			
		||||
@@ -1367,6 +1370,7 @@ struct cfg80211_ap_settings {
 | 
			
		||||
@@ -1369,6 +1372,7 @@ struct cfg80211_ap_settings {
 | 
			
		||||
 	struct cfg80211_fils_discovery fils_discovery;
 | 
			
		||||
 	struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
 | 
			
		||||
 	struct cfg80211_mbssid_config mbssid_config;
 | 
			
		||||
@@ -46,7 +46,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 /**
 | 
			
		||||
@@ -1384,6 +1388,9 @@ struct cfg80211_ap_settings {
 | 
			
		||||
@@ -1386,6 +1390,9 @@ struct cfg80211_ap_settings {
 | 
			
		||||
  * @radar_required: whether radar detection is required on the new channel
 | 
			
		||||
  * @block_tx: whether transmissions should be blocked while changing
 | 
			
		||||
  * @count: number of beacons until switch
 | 
			
		||||
@@ -56,7 +56,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
  */
 | 
			
		||||
 struct cfg80211_csa_settings {
 | 
			
		||||
 	struct cfg80211_chan_def chandef;
 | 
			
		||||
@@ -1396,6 +1403,7 @@ struct cfg80211_csa_settings {
 | 
			
		||||
@@ -1398,6 +1405,7 @@ struct cfg80211_csa_settings {
 | 
			
		||||
 	bool radar_required;
 | 
			
		||||
 	bool block_tx;
 | 
			
		||||
 	u8 count;
 | 
			
		||||
 
 | 
			
		||||
@@ -56,7 +56,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -8441,13 +8441,14 @@ bool cfg80211_reg_can_beacon_relax(struc
 | 
			
		||||
@@ -8443,13 +8443,14 @@ bool cfg80211_reg_can_beacon_relax(struc
 | 
			
		||||
  * @dev: the device which switched channels
 | 
			
		||||
  * @chandef: the new channel definition
 | 
			
		||||
  * @link_id: the link ID for MLO, must be 0 for non-MLO
 | 
			
		||||
@@ -72,7 +72,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 
 | 
			
		||||
 /*
 | 
			
		||||
  * cfg80211_ch_switch_started_notify - notify channel switch start
 | 
			
		||||
@@ -8456,6 +8457,7 @@ void cfg80211_ch_switch_notify(struct ne
 | 
			
		||||
@@ -8458,6 +8459,7 @@ void cfg80211_ch_switch_notify(struct ne
 | 
			
		||||
  * @link_id: the link ID for MLO, must be 0 for non-MLO
 | 
			
		||||
  * @count: the number of TBTTs until the channel switch happens
 | 
			
		||||
  * @quiet: whether or not immediate quiet was requested by the AP
 | 
			
		||||
@@ -80,7 +80,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
  *
 | 
			
		||||
  * Inform the userspace about the channel switch that has just
 | 
			
		||||
  * started, so that it can take appropriate actions (eg. starting
 | 
			
		||||
@@ -8464,7 +8466,7 @@ void cfg80211_ch_switch_notify(struct ne
 | 
			
		||||
@@ -8466,7 +8468,7 @@ void cfg80211_ch_switch_notify(struct ne
 | 
			
		||||
 void cfg80211_ch_switch_started_notify(struct net_device *dev,
 | 
			
		||||
 				       struct cfg80211_chan_def *chandef,
 | 
			
		||||
 				       unsigned int link_id, u8 count,
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 | 
			
		||||
--- a/net/mac80211/util.c
 | 
			
		||||
+++ b/net/mac80211/util.c
 | 
			
		||||
@@ -2493,21 +2493,55 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2487,21 +2487,55 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 
 | 
			
		||||
 	/* Finally also reconfigure all the BSS information */
 | 
			
		||||
 	list_for_each_entry(sdata, &local->interfaces, list) {
 | 
			
		||||
@@ -77,7 +77,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
 		switch (sdata->vif.type) {
 | 
			
		||||
@@ -2527,42 +2561,42 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2521,42 +2555,42 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 					    &sdata->deflink.tx_conf[i]);
 | 
			
		||||
 			break;
 | 
			
		||||
 		}
 | 
			
		||||
@@ -150,7 +150,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			break;
 | 
			
		||||
 		case NL80211_IFTYPE_OCB:
 | 
			
		||||
 			changed |= BSS_CHANGED_OCB;
 | 
			
		||||
@@ -2597,6 +2631,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2591,6 +2625,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 		case NL80211_IFTYPE_NAN:
 | 
			
		||||
 			res = ieee80211_reconfig_nan(sdata);
 | 
			
		||||
 			if (res < 0) {
 | 
			
		||||
@@ -158,7 +158,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 				ieee80211_handle_reconfig_failure(local);
 | 
			
		||||
 				return res;
 | 
			
		||||
 			}
 | 
			
		||||
@@ -2614,6 +2649,10 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2608,6 +2643,10 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 			WARN_ON(1);
 | 
			
		||||
 			break;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 | 
			
		||||
--- a/net/mac80211/util.c
 | 
			
		||||
+++ b/net/mac80211/util.c
 | 
			
		||||
@@ -2344,6 +2344,35 @@ static int ieee80211_reconfig_nan(struct
 | 
			
		||||
@@ -2338,6 +2338,35 @@ static int ieee80211_reconfig_nan(struct
 | 
			
		||||
 	return 0;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -53,7 +53,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 int ieee80211_reconfig(struct ieee80211_local *local)
 | 
			
		||||
 {
 | 
			
		||||
 	struct ieee80211_hw *hw = &local->hw;
 | 
			
		||||
@@ -2606,7 +2635,13 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2600,7 +2629,13 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 			changed |= BSS_CHANGED_IBSS;
 | 
			
		||||
 			fallthrough;
 | 
			
		||||
 		case NL80211_IFTYPE_AP:
 | 
			
		||||
@@ -68,7 +68,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 
 | 
			
		||||
 			if (sdata->vif.bss_conf.ftm_responder == 1 &&
 | 
			
		||||
 			    wiphy_ext_feature_isset(sdata->local->hw.wiphy,
 | 
			
		||||
@@ -2616,6 +2651,13 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2610,6 +2645,13 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 			if (sdata->vif.type == NL80211_IFTYPE_AP) {
 | 
			
		||||
 				changed |= BSS_CHANGED_AP_PROBE_RESP;
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -290,7 +290,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 				data.ap_mld_addr = assoc_data->ap_addr;
 | 
			
		||||
 
 | 
			
		||||
 			cfg80211_assoc_failure(sdata->dev, &data);
 | 
			
		||||
@@ -4979,7 +4980,7 @@ static bool ieee80211_assoc_success(stru
 | 
			
		||||
@@ -4983,7 +4984,7 @@ static bool ieee80211_assoc_success(stru
 | 
			
		||||
 	if (WARN_ON(!sta))
 | 
			
		||||
 		goto out_err;
 | 
			
		||||
 
 | 
			
		||||
@@ -299,7 +299,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		u16 valid_links = 0;
 | 
			
		||||
 
 | 
			
		||||
 		for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) {
 | 
			
		||||
@@ -5008,7 +5009,7 @@ static bool ieee80211_assoc_success(stru
 | 
			
		||||
@@ -5012,7 +5013,7 @@ static bool ieee80211_assoc_success(stru
 | 
			
		||||
 		if (WARN_ON(!link))
 | 
			
		||||
 			goto out_err;
 | 
			
		||||
 
 | 
			
		||||
@@ -308,7 +308,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			link_info(link,
 | 
			
		||||
 				  "local address %pM, AP link address %pM\n",
 | 
			
		||||
 				  link->conf->addr,
 | 
			
		||||
@@ -5240,7 +5241,7 @@ static void ieee80211_rx_mgmt_assoc_resp
 | 
			
		||||
@@ -5244,7 +5245,7 @@ static void ieee80211_rx_mgmt_assoc_resp
 | 
			
		||||
 			ifmgd->broken_ap = true;
 | 
			
		||||
 		}
 | 
			
		||||
 
 | 
			
		||||
@@ -317,7 +317,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			if (!elems->multi_link) {
 | 
			
		||||
 				sdata_info(sdata,
 | 
			
		||||
 					   "MLO association with %pM but no multi-link element in response!\n",
 | 
			
		||||
@@ -5304,7 +5305,7 @@ static void ieee80211_rx_mgmt_assoc_resp
 | 
			
		||||
@@ -5308,7 +5309,7 @@ static void ieee80211_rx_mgmt_assoc_resp
 | 
			
		||||
 				resp.uapsd_queues |= ieee80211_ac_to_qos_mask[ac];
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
@@ -326,7 +326,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		ether_addr_copy(ap_mld_addr, sdata->vif.cfg.ap_addr);
 | 
			
		||||
 		resp.ap_mld_addr = ap_mld_addr;
 | 
			
		||||
 	}
 | 
			
		||||
@@ -5629,7 +5630,7 @@ static void ieee80211_rx_mgmt_beacon(str
 | 
			
		||||
@@ -5633,7 +5634,7 @@ static void ieee80211_rx_mgmt_beacon(str
 | 
			
		||||
 	rcu_read_unlock();
 | 
			
		||||
 
 | 
			
		||||
 	if (ifmgd->assoc_data && ifmgd->assoc_data->need_beacon &&
 | 
			
		||||
@@ -335,7 +335,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 	    ieee80211_rx_our_beacon(bssid, ifmgd->assoc_data->link[0].bss)) {
 | 
			
		||||
 		parse_params.bss = ifmgd->assoc_data->link[0].bss;
 | 
			
		||||
 		elems = ieee802_11_parse_elems_full(&parse_params);
 | 
			
		||||
@@ -6319,7 +6320,7 @@ static void ieee80211_sta_bcn_mon_timer(
 | 
			
		||||
@@ -6323,7 +6324,7 @@ static void ieee80211_sta_bcn_mon_timer(
 | 
			
		||||
 	struct ieee80211_sub_if_data *sdata =
 | 
			
		||||
 		from_timer(sdata, t, u.mgd.bcn_mon_timer);
 | 
			
		||||
 
 | 
			
		||||
@@ -344,7 +344,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		return;
 | 
			
		||||
 
 | 
			
		||||
 	if (sdata->vif.bss_conf.csa_active &&
 | 
			
		||||
@@ -6343,7 +6344,7 @@ static void ieee80211_sta_conn_mon_timer
 | 
			
		||||
@@ -6347,7 +6348,7 @@ static void ieee80211_sta_conn_mon_timer
 | 
			
		||||
 	struct sta_info *sta;
 | 
			
		||||
 	unsigned long timeout;
 | 
			
		||||
 
 | 
			
		||||
@@ -353,7 +353,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 		return;
 | 
			
		||||
 
 | 
			
		||||
 	if (sdata->vif.bss_conf.csa_active &&
 | 
			
		||||
@@ -6898,7 +6899,7 @@ int ieee80211_mgd_auth(struct ieee80211_
 | 
			
		||||
@@ -6902,7 +6903,7 @@ int ieee80211_mgd_auth(struct ieee80211_
 | 
			
		||||
 	return 0;
 | 
			
		||||
 
 | 
			
		||||
  err_clear:
 | 
			
		||||
@@ -476,7 +476,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			rcu_dereference(sdata->vif.bss_conf.chanctx_conf);
 | 
			
		||||
--- a/net/mac80211/util.c
 | 
			
		||||
+++ b/net/mac80211/util.c
 | 
			
		||||
@@ -1701,7 +1701,7 @@ void ieee80211_send_auth(struct ieee8021
 | 
			
		||||
@@ -1691,7 +1691,7 @@ void ieee80211_send_auth(struct ieee8021
 | 
			
		||||
 	struct ieee80211_local *local = sdata->local;
 | 
			
		||||
 	struct sk_buff *skb;
 | 
			
		||||
 	struct ieee80211_mgmt *mgmt;
 | 
			
		||||
@@ -485,7 +485,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 	struct {
 | 
			
		||||
 		u8 id;
 | 
			
		||||
 		u8 len;
 | 
			
		||||
@@ -2542,7 +2542,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2536,7 +2536,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 			continue;
 | 
			
		||||
 
 | 
			
		||||
 		sdata_lock(sdata);
 | 
			
		||||
@@ -494,7 +494,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS] = {
 | 
			
		||||
 				[0] = &sdata->vif.bss_conf,
 | 
			
		||||
 			};
 | 
			
		||||
@@ -2562,7 +2562,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2556,7 +2556,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 		for (link_id = 0;
 | 
			
		||||
 		     link_id < ARRAY_SIZE(sdata->vif.link_conf);
 | 
			
		||||
 		     link_id++) {
 | 
			
		||||
@@ -503,7 +503,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 			    !(sdata->vif.active_links & BIT(link_id)))
 | 
			
		||||
 				continue;
 | 
			
		||||
 
 | 
			
		||||
@@ -2594,12 +2594,12 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2588,12 +2588,12 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 		if (sdata->vif.bss_conf.mu_mimo_owner)
 | 
			
		||||
 			changed |= BSS_CHANGED_MU_GROUPS;
 | 
			
		||||
 
 | 
			
		||||
@@ -518,7 +518,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 				changed |= BSS_CHANGED_ASSOC |
 | 
			
		||||
 					   BSS_CHANGED_ARP_FILTER |
 | 
			
		||||
 					   BSS_CHANGED_PS;
 | 
			
		||||
@@ -2637,7 +2637,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2631,7 +2631,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 		case NL80211_IFTYPE_AP:
 | 
			
		||||
 			changed |= BSS_CHANGED_P2P_PS;
 | 
			
		||||
 
 | 
			
		||||
@@ -527,7 +527,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 				ieee80211_vif_cfg_change_notify(sdata,
 | 
			
		||||
 								BSS_CHANGED_SSID);
 | 
			
		||||
 			else
 | 
			
		||||
@@ -2651,7 +2651,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
@@ -2645,7 +2645,7 @@ int ieee80211_reconfig(struct ieee80211_
 | 
			
		||||
 			if (sdata->vif.type == NL80211_IFTYPE_AP) {
 | 
			
		||||
 				changed |= BSS_CHANGED_AP_PROBE_RESP;
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -4095,6 +4095,7 @@ struct mgmt_frame_regs {
 | 
			
		||||
@@ -4097,6 +4097,7 @@ struct mgmt_frame_regs {
 | 
			
		||||
  *	(as advertised by the nl80211 feature flag.)
 | 
			
		||||
  * @get_tx_power: store the current TX power into the dbm variable;
 | 
			
		||||
  *	return 0 if successful
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
  *
 | 
			
		||||
  * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
 | 
			
		||||
  *	functions to adjust rfkill hw state
 | 
			
		||||
@@ -4445,6 +4446,7 @@ struct cfg80211_ops {
 | 
			
		||||
@@ -4447,6 +4448,7 @@ struct cfg80211_ops {
 | 
			
		||||
 				enum nl80211_tx_power_setting type, int mbm);
 | 
			
		||||
 	int	(*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
 | 
			
		||||
 				int *dbm);
 | 
			
		||||
 
 | 
			
		||||
@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 | 
			
		||||
 | 
			
		||||
--- a/include/net/cfg80211.h
 | 
			
		||||
+++ b/include/net/cfg80211.h
 | 
			
		||||
@@ -555,6 +555,33 @@ struct ieee80211_supported_band {
 | 
			
		||||
@@ -557,6 +557,33 @@ struct ieee80211_supported_band {
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 /**
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user