diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 16:53:20 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 16:53:20 +0100 |
| commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
| tree | 6cd273487574edd2da40ce14b1981e14a5171caa /net/wireless/sme.c | |
| parent | mwifiex: update MCS set as per RX-STBC bit from hostapd (diff) | |
| parent | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev) (diff) | |
| download | linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.xz linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index f04d4c32e96e..acdcb4a81817 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -64,7 +64,6 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev) int n_channels, err; ASSERT_RTNL(); - ASSERT_RDEV_LOCK(rdev); ASSERT_WDEV_LOCK(wdev); if (rdev->scan_req || rdev->scan_msg) |