---

yaml --- r: 171903 b: refs/heads/master c: 3305443 h: refs/heads/master i: 171901: 5c31446 171899: bff0f2d 171895: 512a4f9 171887: 8e41c79 171871: 462bc82 171839: 9574057 171775: 087aa60 v: v3
git-mirror · Nov 23, 2009 · d0f4cdb · d0f4cdb
1 parent 62a7a73
commit d0f4cdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);
 		}