mac80211: fix an ap + sta mode regression that prevented the sta from…

… connecting (#11847) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32684 3c298f89-4303-0410-b956-a3cf2f4a3e73
dtaht · Jul 12, 2012 · ae5ca58 · ae5ca58
1 parent 9c4d41a
commit ae5ca58
Showing 1 changed file with 21 additions and 0 deletions.
diff --git 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: