aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-07-12 14:14:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-07-12 14:14:57 +0000
commitc78c2f80a13188fdabb009f9ab84904ba8d4cc6f (patch)
tree07c8fb9225667f6bba5032b0a0279dfe0ade9975 /package/mac80211
parent33220828dc3f7a41ae066b47375929dad6deb914 (diff)
downloadupstream-c78c2f80a13188fdabb009f9ab84904ba8d4cc6f.tar.gz
upstream-c78c2f80a13188fdabb009f9ab84904ba8d4cc6f.tar.bz2
upstream-c78c2f80a13188fdabb009f9ab84904ba8d4cc6f.zip
mac80211: fix an ap + sta mode regression that prevented the sta from connecting (#11847)
SVN-Revision: 32684
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/300-pending_work.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index c8dce038e3..1fec1b4383 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1984,3 +1984,24 @@
skb_set_mac_header(skb, 0);
skb_set_network_header(skb, 0);
+--- a/net/wireless/chan.c
++++ b/net/wireless/chan.c
+@@ -136,9 +136,16 @@ cfg80211_get_chan_state(struct cfg80211_
+ break;
+ case NL80211_IFTYPE_AP:
+ case NL80211_IFTYPE_P2P_GO:
++ if (wdev->beacon_interval) {
++ *chan = wdev->channel;
++ *chanmode = CHAN_MODE_SHARED;
++ }
++ return;
+ case NL80211_IFTYPE_MESH_POINT:
+- *chan = wdev->channel;
+- *chanmode = CHAN_MODE_SHARED;
++ if (wdev->mesh_id_len) {
++ *chan = wdev->channel;
++ *chanmode = CHAN_MODE_SHARED;
++ }
+ return;
+ case NL80211_IFTYPE_MONITOR:
+ case NL80211_IFTYPE_AP_VLAN: