mac80211: merge upstream fixes

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39442 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/kernel/mac80211/patches/310-ap_scan.patch

 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -2142,7 +2142,7 @@ static int ieee80211_scan(struct wiphy *
+@@ -2145,7 +2145,7 @@ static int ieee80211_scan(struct wiphy *
  		 * the  frames sent while scanning on other channel will be
  		 * lost)
  		 */

package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch

@@ -10,7 +10,7 @@
  	u8 uapsd_queues;
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -2323,7 +2323,9 @@ static int ieee80211_get_tx_power(struct
+@@ -2326,7 +2326,9 @@ static int ieee80211_get_tx_power(struct
  	struct ieee80211_local *local = wiphy_priv(wiphy);
  	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
  

package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch

@@ -57,7 +57,7 @@
  	__NL80211_ATTR_AFTER_LAST,
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -2333,6 +2333,19 @@ static int ieee80211_get_tx_power(struct
+@@ -2336,6 +2336,19 @@ static int ieee80211_get_tx_power(struct
  	return 0;
  }
  
@@ -77,7 +77,7 @@
  static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
  				  const u8 *addr)
  {
-@@ -3916,6 +3929,7 @@ struct cfg80211_ops mac80211_config_ops 
+@@ -3921,6 +3934,7 @@ struct cfg80211_ops mac80211_config_ops 
  	.set_wiphy_params = ieee80211_set_wiphy_params,
  	.set_tx_power = ieee80211_set_tx_power,
  	.get_tx_power = ieee80211_get_tx_power,