Changeset 32684

Timestamp:

2012-07-12T16:14:57+02:00 (6 years ago)

Author:

nbd

Message:

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

File:

• trunk/package/mac80211/patches/300-pending_work.patch (modified) (1 diff)

trunk/package/mac80211/patches/300-pending_work.patch

@@ -1985 +1985 @@
         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: