From d0f4cdb8ed0a7ebf0ebad40521ecd0c632b3be50 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 20 Nov 2009 10:09:14 +0100
Subject: [PATCH] --- yaml --- r: 171903 b: refs/heads/master c:
 3305443c968b98902199bea0abbd9443c6a2bb8d h: refs/heads/master i:   171901:
 5c31446b8795cf453425f8961f564b41a0e39b5d   171899:
 bff0f2d67715e75b6aff6231927a69b5ac441ce5   171895:
 512a4f99dfec6260730966ad4eaa33d075b100e7   171887:
 8e41c7958187e4cf3791c1d9201a4a194ce85d39   171871:
 462bc82f69503a47b266b886b9492cedb9661f02   171839:
 9574057c8b2f37e87c55da554a0cc1299b40f054   171775:
 087aa606f8f6af1430371d602652c5df6ff4ec8d v: v3

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

diff --git a/[refs] b/[refs]
index 710e73147527..72398b5edc9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1cf2dbd0f798b71b1590e7aca6647f2caef1649
+refs/heads/master: 3305443c968b98902199bea0abbd9443c6a2bb8d
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index c484a882140e..93ee1fd5c08d 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -823,8 +823,10 @@ static int ieee80211_change_station(struct wiphy *wiphy,
 		}
 
 		if (params->vlan->ieee80211_ptr->use_4addr) {
-			if (vlansdata->u.vlan.sta)
+			if (vlansdata->u.vlan.sta) {
+				rcu_read_unlock();
 				return -EBUSY;
+			}
 
 			rcu_assign_pointer(vlansdata->u.vlan.sta, sta);
 		}