diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-25 15:13:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-25 15:13:37 -0400 |
| commit | 202149265770426f0965557ffa0b500fbbd701dd (patch) | |
| tree | 3a6fe0c357b6eb6ac5e15a0ec27eaf570ebfd0ce /net/mac80211/iface.c | |
| parent | f891ea1634ce41f5f47ae40d8594809f4cd2ca66 (diff) | |
| parent | 395836282f7cf8b1dac9b9c2aa2bacddfa1580b5 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 401c01f0731..c20051b7ffc 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -486,6 +486,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, /* free all potentially still buffered bcast frames */ local->total_ps_buffered -= skb_queue_len(&sdata->u.ap.ps_bc_buf); skb_queue_purge(&sdata->u.ap.ps_bc_buf); + } else if (sdata->vif.type == NL80211_IFTYPE_STATION) { + ieee80211_mgd_stop(sdata); } if (going_down) @@ -644,8 +646,6 @@ static void ieee80211_teardown_sdata(struct net_device *dev) if (ieee80211_vif_is_mesh(&sdata->vif)) mesh_rmc_free(sdata); - else if (sdata->vif.type == NL80211_IFTYPE_STATION) - ieee80211_mgd_teardown(sdata); flushed = sta_info_flush(local, sdata); WARN_ON(flushed); |