From 7510102412d49c70a3aed7f54e57d3c2df3f1926 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 15 Sep 2010 15:13:13 +0200 Subject: [PATCH] --- yaml --- r: 214682 b: refs/heads/master c: 2d2080c3c1d52e186166afc3efe5067291e618bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 66b7828f3dbb..66b80d2087cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4 +refs/heads/master: 2d2080c3c1d52e186166afc3efe5067291e618bf diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index c1cc200ac81f..95908aaa8a68 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -280,6 +280,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) netif_carrier_on(dev); } + set_bit(SDATA_STATE_RUNNING, &sdata->state); + if (sdata->vif.type == NL80211_IFTYPE_WDS) { /* Create STA entry for the WDS peer */ sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr, @@ -331,8 +333,6 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) netif_tx_start_all_queues(dev); - set_bit(SDATA_STATE_RUNNING, &sdata->state); - return 0; err_del_interface: drv_remove_interface(local, &sdata->vif); @@ -343,6 +343,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); + clear_bit(SDATA_STATE_RUNNING, &sdata->state); return res; }