33 lines
1 KiB
Diff
33 lines
1 KiB
Diff
|
From: Ben Greear <greearb@candelatech.com>
|
||
|
Date: Fri, 1 Apr 2016 14:12:11 -0700
|
||
|
Subject: [PATCH] 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>
|
||
|
---
|
||
|
|
||
|
--- a/drivers/net/wireless/ath/ath10k/mac.c
|
||
|
+++ b/drivers/net/wireless/ath/ath10k/mac.c
|
||
|
@@ -5949,9 +5949,17 @@ static int ath10k_sta_state(struct ieee8
|
||
|
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);
|