diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-08-08 11:03:58 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:51 -0400 |
| commit | 4b181144e6c1c25aaba9b9fc7cc70c95495ecb92 (patch) | |
| tree | 93f85f1c99f097ec3c60f45b7b917c1b0dfbf7f9 /net/wireless/chan.c | |
| parent | e312c24cf8229f9b6e76dbfd5d99eefe21f4ac0a (diff) | |
| download | linux-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/chan.c')
| -rw-r--r-- | net/wireless/chan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index bc00c9a06b3d..a46ac6c9b365 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -42,13 +42,14 @@ rdev_fixed_channel(struct cfg80211_registered_device *rdev, } int rdev_set_freq(struct cfg80211_registered_device *rdev, + struct wireless_dev *for_wdev, int freq, enum nl80211_channel_type channel_type) { struct ieee80211_channel *chan; struct ieee80211_sta_ht_cap *ht_cap; int result; - if (rdev_fixed_channel(rdev, NULL)) + if (rdev_fixed_channel(rdev, for_wdev)) return -EBUSY; if (!rdev->ops->set_channel) |