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

SVN-Revision: 32684
12 years ago · c78c2f80a1
parent 33220828dc
commit c78c2f80a1
1 changed files with 21 additions and 0 deletions
--- 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: