diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-26 20:46:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-26 20:46:41 +0100 |
| commit | 62c8003ecb973986958e9dade4a7e598349caf48 (patch) | |
| tree | 0e831639cd6449c2955234cfc37ef46481c788d1 /net/wireless/wext-sme.c | |
| parent | rtl8723ae: fix build break from "mac80211: support RX_FLAG_MACTIME_END" (diff) | |
| parent | cfg80211: fix some tracing output issues (diff) | |
| download | linux-62c8003ecb973986958e9dade4a7e598349caf48.tar.xz linux-62c8003ecb973986958e9dade4a7e598349caf48.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/wext-sme.c')
| -rw-r--r-- | net/wireless/wext-sme.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c index 1f773f668d1a..873af63187c0 100644 --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -119,7 +119,16 @@ int cfg80211_mgd_wext_siwfreq(struct net_device *dev, * channel we disconnected above and reconnect below. */ if (chan && !wdev->wext.connect.ssid_len) { - err = cfg80211_set_monitor_channel(rdev, freq, NL80211_CHAN_NO_HT); + struct cfg80211_chan_def chandef = { + .width = NL80211_CHAN_WIDTH_20_NOHT, + .center_freq1 = freq, + }; + + chandef.chan = ieee80211_get_channel(&rdev->wiphy, freq); + if (chandef.chan) + err = cfg80211_set_monitor_channel(rdev, &chandef); + else + err = -EINVAL; goto out; } |