From: Ben Greear <gree...@candelatech.com>

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 <gree...@candelatech.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c 
b/drivers/net/wireless/ath/ath10k/mac.c
index 5e5cc9c..020dd25 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6501,9 +6501,17 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
                                continue;
 
                        if (peer->sta == sta) {
-                               ath10k_warn(ar, "found sta peer %pM id: %d 
entry on vdev %i after it was supposedly removed\n",
-                                           sta->addr, i, 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);
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to