summaryrefslogtreecommitdiffstats
path: root/net/wireless/sme.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-05-29 10:59:35 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-05-29 10:59:35 -0400
commit50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3 (patch)
tree50a1488b5bf44499fe8d2ad73543bf7f8fc4b05b /net/wireless/sme.c
parent8e6d91ae0917bf934ed86411148f79d904728d51 (diff)
parentadd295a4afbdf5852d004c754c552d692b0fcac8 (diff)
downloadlinux-50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3.tar.gz
linux-50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3.tar.bz2
linux-50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3.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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 8b5eddfba1e5..3ed35c345cae 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -231,6 +231,9 @@ void cfg80211_conn_work(struct work_struct *work)
mutex_lock(&rdev->sched_scan_mtx);
list_for_each_entry(wdev, &rdev->wdev_list, list) {
+ if (!wdev->netdev)
+ continue;
+
wdev_lock(wdev);
if (!netif_running(wdev->netdev)) {
wdev_unlock(wdev);