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 60a53242cecf..532c07756022 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);