--- /dev/null
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1796,8 +1796,6 @@ static int ieee80211_scan(struct wiphy *
+ * beaconing hasn't been configured yet
+ */
+ case NL80211_IFTYPE_AP:
+- if (sdata->u.ap.beacon)
+- return -EOPNOTSUPP;
+ break;
+ default:
+ return -EOPNOTSUPP;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -1969,7 +1969,7 @@ static int ieee80211_get_tx_power(struct
+@@ -1967,7 +1967,7 @@ static int ieee80211_get_tx_power(struct
{
struct ieee80211_local *local = wiphy_priv(wiphy);
u32 tx_ant, rx_ant;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -1986,6 +1986,19 @@ static int ieee80211_get_tx_power(struct
+@@ -1984,6 +1984,19 @@ static int ieee80211_get_tx_power(struct
return 0;
}
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
const u8 *addr)
{
-@@ -3084,6 +3097,7 @@ struct cfg80211_ops mac80211_config_ops
+@@ -3082,6 +3095,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,
union {
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2162,9 +2162,20 @@ static int ieee80211_set_bitrate_mask(st
+@@ -2160,9 +2160,20 @@ static int ieee80211_set_bitrate_mask(st
}
for (i = 0; i < IEEE80211_NUM_BANDS; i++) {