diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
| commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
| tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /net/wireless | |
| parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
| parent | ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 4 | ||||
| -rw-r--r-- | net/wireless/sme.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 0a545bb6ed05..20db90246de5 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -746,9 +746,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, mutex_unlock(&rdev->devlist_mtx); dev_put(dev); } -#ifdef CONFIG_CFG80211_WEXT cfg80211_lock_rdev(rdev); mutex_lock(&rdev->devlist_mtx); +#ifdef CONFIG_CFG80211_WEXT wdev_lock(wdev); switch (wdev->iftype) { case NL80211_IFTYPE_ADHOC: @@ -761,10 +761,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, break; } wdev_unlock(wdev); +#endif rdev->opencount++; mutex_unlock(&rdev->devlist_mtx); cfg80211_unlock_rdev(rdev); -#endif break; case NETDEV_UNREGISTER: /* diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 2ce5e1609a3d..745c37e7992e 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -656,6 +656,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie, memset(&wrqu, 0, sizeof(wrqu)); wrqu.ap_addr.sa_family = ARPHRD_ETHER; wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL); + wdev->wext.connect.ssid_len = 0; #endif } |