diff options
| author | Ben Greear <greearb@candelatech.com> | 2016-06-30 15:23:59 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-07-08 09:48:22 +0300 |
| commit | d0eeafad118940fe445ca00f45be5624fea2ec34 (patch) | |
| tree | 4a220d4e3b1e974a8f32db2b3054ebf6340bc0dc /drivers/net/wireless | |
| parent | c5ace87a886d8ae35a7fc75a8140c2a7b3ff79b1 (diff) | |
| download | op-kernel-dev-d0eeafad118940fe445ca00f45be5624fea2ec34.zip op-kernel-dev-d0eeafad118940fe445ca00f45be5624fea2ec34.tar.gz | |
ath10k: Clean up peer when sta goes away.
If WMI and/or firmware has issues removing the peer object,
then we still need to clean up the peer object in the driver.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 60a5324..532c077 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -5997,9 +5997,17 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, continue; if (peer->sta == sta) { - ath10k_warn(ar, "found sta peer %pM entry on vdev %i after it was supposedly removed\n", - sta->addr, arvif->vdev_id); + ath10k_warn(ar, "found sta peer %pM (ptr %p id %d) entry on vdev %i after it was supposedly removed\n", + sta->addr, peer, i, arvif->vdev_id); peer->sta = NULL; + + /* Clean up the peer object as well since we + * must have failed to do this above. + */ + list_del(&peer->list); + ar->peer_map[i] = NULL; + kfree(peer); + ar->num_peers--; } } spin_unlock_bh(&ar->data_lock); |
