summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-03 19:13:20 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-03 19:13:20 +0000
commitbb1c19e782a88cd54d938f73ebd6006cea111631 (patch)
tree589445ea560a3a973e43f144521006e4e3a50c24
parent028bced8d726137e67e55fbd315bb5c12d5445d5 (diff)
mac80211: allow scans in access point mode (for site survey)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33613 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/310-ap_scan.patch11
-rw-r--r--package/mac80211/patches/520-mac80211_cur_txpower.patch2
-rw-r--r--package/mac80211/patches/524-mac80211_configure_antenna_gain.patch4
-rw-r--r--package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch2
4 files changed, 15 insertions, 4 deletions
diff --git a/package/mac80211/patches/310-ap_scan.patch b/package/mac80211/patches/310-ap_scan.patch
new file mode 100644
index 000000000..67a9dcaba
--- /dev/null
+++ b/package/mac80211/patches/310-ap_scan.patch
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch
index 1b7348c08..54f2e5040 100644
--- a/package/mac80211/patches/520-mac80211_cur_txpower.patch
+++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -10,7 +10,7 @@
--- 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);
diff --git a/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch b/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch
index 9bf7fc94b..b2870a8aa 100644
--- a/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch
+++ b/package/mac80211/patches/524-mac80211_configure_antenna_gain.patch
@@ -131,7 +131,7 @@
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;
}
@@ -151,7 +151,7 @@
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,
diff --git a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
index 01377fed6..53889d19c 100644
--- a/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
+++ b/package/mac80211/patches/550-mac80211_optimize_mcs_rate_mask.patch
@@ -11,7 +11,7 @@
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++) {