diff options
| author | Thomas Pedersen | 2013-02-06 19:17:21 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-02-11 18:44:54 +0100 |
| commit | 45b5028e86292284f4d5794047d5dfd742c22421 (patch) | |
| tree | 126650c535a6d88fcace074d9f4987abbb1f9762 /net/mac80211/sta_info.c | |
| parent | wireless: fix kernel-doc (diff) | |
| download | kernel-qcow2-linux-45b5028e86292284f4d5794047d5dfd742c22421.tar.gz kernel-qcow2-linux-45b5028e86292284f4d5794047d5dfd742c22421.tar.xz kernel-qcow2-linux-45b5028e86292284f4d5794047d5dfd742c22421.zip | |
mac80211: fix mesh sta teardown
The patch "mac80211: clean up mesh sta allocation warning"
moved some mesh initialization into a path which is only
called when the kernel handles peering. This causes a hang
when mac80211 tries to clean up a userspace-allocated
station entry and delete a timer which has never been
initialized.
To avoid this, only do any mesh sta peering teardown if
the kernel is actually handling it.
The same is true when quiescing before suspend.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 47a0f0601768..19db20a58e23 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -137,13 +137,8 @@ static void cleanup_single_sta(struct sta_info *sta) ieee80211_purge_tx_queue(&local->hw, &sta->tx_filtered[ac]); } -#ifdef CONFIG_MAC80211_MESH - if (ieee80211_vif_is_mesh(&sdata->vif)) { - mesh_accept_plinks_update(sdata); - mesh_plink_deactivate(sta); - del_timer_sync(&sta->plink_timer); - } -#endif + if (ieee80211_vif_is_mesh(&sdata->vif)) + mesh_sta_cleanup(sta); cancel_work_sync(&sta->drv_unblock_wk); |