diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-07-12 14:14:57 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-07-12 14:14:57 +0000 |
| commit | b5d7bca405ceaf89a7c5135047db017cb17c2a61 (patch) | |
| tree | 4243a5b8b5fb775f1d040b3772e30ec6840a7be5 /package/mac80211/patches/300-pending_work.patch | |
| parent | 42ee0d2a0f1ebf5c549805ac9d001ba486ba3982 (diff) | |
| download | master-187ad058-b5d7bca405ceaf89a7c5135047db017cb17c2a61.tar.gz master-187ad058-b5d7bca405ceaf89a7c5135047db017cb17c2a61.tar.bz2 master-187ad058-b5d7bca405ceaf89a7c5135047db017cb17c2a61.zip | |
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
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 21 |
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: |