git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dm-3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...
[pandora-kernel.git]
/
net
/
wireless
/
sme.c
diff --git
a/net/wireless/sme.c
b/net/wireless/sme.c
index
f04d4c3
..
acdcb4a
100644
(file)
--- 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)