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/core.c | |
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/core.c')
-rw-r--r-- | net/wireless/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 0a545bb6ed0..20db90246de 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, | |||
746 | mutex_unlock(&rdev->devlist_mtx); | 746 | mutex_unlock(&rdev->devlist_mtx); |
747 | dev_put(dev); | 747 | dev_put(dev); |
748 | } | 748 | } |
749 | #ifdef CONFIG_CFG80211_WEXT | ||
750 | cfg80211_lock_rdev(rdev); | 749 | cfg80211_lock_rdev(rdev); |
751 | mutex_lock(&rdev->devlist_mtx); | 750 | mutex_lock(&rdev->devlist_mtx); |
751 | #ifdef CONFIG_CFG80211_WEXT | ||
752 | wdev_lock(wdev); | 752 | wdev_lock(wdev); |
753 | switch (wdev->iftype) { | 753 | switch (wdev->iftype) { |
754 | case NL80211_IFTYPE_ADHOC: | 754 | case NL80211_IFTYPE_ADHOC: |
@@ -761,10 +761,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, | |||
761 | break; | 761 | break; |
762 | } | 762 | } |
763 | wdev_unlock(wdev); | 763 | wdev_unlock(wdev); |
764 | #endif | ||
764 | rdev->opencount++; | 765 | rdev->opencount++; |
765 | mutex_unlock(&rdev->devlist_mtx); | 766 | mutex_unlock(&rdev->devlist_mtx); |
766 | cfg80211_unlock_rdev(rdev); | 767 | cfg80211_unlock_rdev(rdev); |
767 | #endif | ||
768 | break; | 768 | break; |
769 | case NETDEV_UNREGISTER: | 769 | case NETDEV_UNREGISTER: |
770 | /* | 770 | /* |