diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-07 19:44:14 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-07 19:44:14 +0100 |
| commit | 0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9 (patch) | |
| tree | ef46bd077c1710a0474b5b3b31c543783197a274 /net/wireless/sme.c | |
| parent | inet: defines IPPROTO_* needed for module alias generation (diff) | |
| parent | rtl8180: Add error check for pci_map_single return value in TX path (diff) | |
| download | linux-0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9.tar.xz linux-0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index a63509118508..f04d4c32e96e 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -67,7 +67,7 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev) ASSERT_RDEV_LOCK(rdev); ASSERT_WDEV_LOCK(wdev); - if (rdev->scan_req) + if (rdev->scan_req || rdev->scan_msg) return -EBUSY; if (wdev->conn->params.channel) |