diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-07-10 19:39:02 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-12 12:10:49 +0200 |
commit | 8e95ea49c94908cb10e698c5637d57f0fbdc796d (patch) | |
tree | 597f5817baab936980b6d888bfe695e8a40dc747 /net/wireless/core.h | |
parent | 2a9e6c58871df77b69afffad250062853570ee23 (diff) | |
download | op-kernel-dev-8e95ea49c94908cb10e698c5637d57f0fbdc796d.zip op-kernel-dev-8e95ea49c94908cb10e698c5637d57f0fbdc796d.tar.gz |
cfg80211: fix locking and lockdep complaints
To call cfg80211_get_chan_state() we need to lock
the wdev, so we need to lock the wdev_iter mutex
in cfg80211_can_use_iftype_chan(). This needs to
use nested locking for lockdep.
Also, cfg80211_get_chan_state() doesn't actually
use the rdev, so remove that completely including
the lock assertion that isn't needed.
Reported-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.h')
-rw-r--r-- | net/wireless/core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index eae5a25..bac97da 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -463,8 +463,7 @@ cfg80211_can_use_chan(struct cfg80211_registered_device *rdev, } void -cfg80211_get_chan_state(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev, +cfg80211_get_chan_state(struct wireless_dev *wdev, struct ieee80211_channel **chan, enum cfg80211_chan_mode *chanmode); |