From b89212bf13bd37ac483638a149451c136bb40a1b Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 3 Apr 2012 14:45:54 +0200
Subject: [PATCH] --- yaml --- r: 300701 b: refs/heads/master c:
 4d6c36fa227afc7b76b85ee48e3ef3972fe0ca23 h: refs/heads/master i:   300699:
 22bcaf014b3385c9e3db6dd4c0a19d20e3561466 v: v3

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

diff --git a/[refs] b/[refs]
index 817d6b8bd084..49cfa1aa673c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a25a8c8b75b430c4f4022918e26fa51d557ecde
+refs/heads/master: 4d6c36fa227afc7b76b85ee48e3ef3972fe0ca23
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index ed297649c577..6e85faed053d 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -349,9 +349,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 		memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
 
 		if (!is_valid_ether_addr(dev->dev_addr)) {
-			if (!local->open_count)
-				drv_stop(local);
-			return -EADDRNOTAVAIL;
+			res = -EADDRNOTAVAIL;
+			goto err_stop;
 		}
 	}
 
@@ -485,6 +484,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 	sdata->bss = NULL;
 	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
 		list_del(&sdata->u.vlan.list);
+	/* might already be clear but that doesn't matter */
 	clear_bit(SDATA_STATE_RUNNING, &sdata->state);
 	return res;
 }