Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nl80211: Allow association to change channels during reassociation

Browse source 
nl80211_associate() was rejecting (re)association attempts with EBUSY
in some cases where we are currently associated with an AP that uses
different channel from the destination AP. Fix this by passing the
current wdev to rdev_fixed_channel() in the same way that was already
done for join-IBSS and connect commands. This allows the fixedchan
check to skipped for the current wdev and allows the reassociation to
proceed.

Signed-off-by: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jouni Malinen 2010-01-19 10:53:30 -08:00 committed by John W. Linville
parent 1625c148cd
commit 27e310c91c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/wireless/nl80211.c
View file

@ -3571,6 +3571,7 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
{ {
struct cfg80211_registered_device *rdev; struct cfg80211_registered_device *rdev;
struct net_device *dev; struct net_device *dev;
struct wireless_dev *wdev;
struct cfg80211_crypto_settings crypto; struct cfg80211_crypto_settings crypto;
struct ieee80211_channel *chan, *fixedchan; struct ieee80211_channel *chan, *fixedchan;
const u8 *bssid, *ssid, *ie = NULL, *prev_bssid = NULL; const u8 *bssid, *ssid, *ie = NULL, *prev_bssid = NULL;
@ -3616,7 +3617,8 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
} }
mutex_lock(&rdev->devlist_mtx); mutex_lock(&rdev->devlist_mtx);
fixedchan = rdev_fixed_channel(rdev, NULL); wdev = dev->ieee80211_ptr;
fixedchan = rdev_fixed_channel(rdev, wdev);
if (fixedchan && chan != fixedchan) { if (fixedchan && chan != fixedchan) {
err = -EBUSY; err = -EBUSY;
mutex_unlock(&rdev->devlist_mtx); mutex_unlock(&rdev->devlist_mtx);