summaryrefslogtreecommitdiffstats
path: root/net/wireless/wext-compat.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-08-08 11:03:58 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:13:51 -0400
commit4b181144e6c1c25aaba9b9fc7cc70c95495ecb92 (patch)
tree93f85f1c99f097ec3c60f45b7b917c1b0dfbf7f9 /net/wireless/wext-compat.c
parente312c24cf8229f9b6e76dbfd5d99eefe21f4ac0a (diff)
downloadlinux-4b181144e6c1c25aaba9b9fc7cc70c95495ecb92.tar.bz2
cfg80211: fix locking for SIWFREQ
"cfg80211: validate channel settings across interfaces" contained a locking bug -- in the managed-mode SIWFREQ call it would end up running into a lock recursion. This fixes it by not checking that particular interface for a channel that it needs to stay on, which is as it should be as that's the interface we're setting the channel for. Reported-by: Reinette Chatre <reinette.chatre@intel.com> Reported-by: Kalle Valo <kalle.valo@iki.fi> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Tested-by: Kalle Valo <kalle.valo@iki.fi> Tested-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r--net/wireless/wext-compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 17648dc79867..c44917492210 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -766,7 +766,7 @@ int cfg80211_wext_siwfreq(struct net_device *dev,
if (freq == 0)
return -EINVAL;
mutex_lock(&rdev->devlist_mtx);
- err = rdev_set_freq(rdev, freq, NL80211_CHAN_NO_HT);
+ err = rdev_set_freq(rdev, NULL, freq, NL80211_CHAN_NO_HT);
mutex_unlock(&rdev->devlist_mtx);
return err;
}