qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 08:38:58 +02:00
Code

mac80211: fix an ap + sta mode regression that prevented the sta from connecting (#11847)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32684 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-07-12 14:14:57 +00:00
parent 9c4d41a426
commit ae5ca58852
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/mac80211/patches/300-pending_work.patch
View File

@ -1984,3 +1984,24 @@
skb_set_mac_header(skb, 0); skb_set_mac_header(skb, 0);
skb_set_network_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: