diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-05-28 13:38:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-05-28 13:38:53 -0400 |
commit | d61bdbf1235b7a11b29197b538bbee41855eaf38 (patch) | |
tree | e60008e184176ceb1d9db9da696326b18c3ccd15 /net/wireless/sme.c | |
parent | 86c157b3f83597e11d8f03a9dece98d1e77a8ce7 (diff) | |
parent | ac20976dcaeea3e77e40e9aac8f3799d2a22ea2b (diff) | |
download | op-kernel-dev-d61bdbf1235b7a11b29197b538bbee41855eaf38.zip op-kernel-dev-d61bdbf1235b7a11b29197b538bbee41855eaf38.tar.gz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r-- | net/wireless/sme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 8b5eddf..3ed35c3 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); |