From 5ebe577a8ade4c905d53573bb05a83a091a446c3 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 11 Jan 2010 16:14:57 +0100
Subject: [PATCH] --- yaml --- r: 179253 b: refs/heads/master c:
 8c5d9808e95739c9001b852464fd58fd0f583280 h: refs/heads/master i:   179251:
 a3909b2e8691d2cc15b5eb2451d9d6520be95106 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5c0b413222b8..8fee3a8ac747 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 193e70ef65a6c33f2935ce1f4adeb08ecb9202cf
+refs/heads/master: 8c5d9808e95739c9001b852464fd58fd0f583280
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index c2a2c563d21a..92b812442488 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -745,9 +745,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:
@@ -760,10 +760,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:
 		/*