aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-07 13:27:26 +0200
committerFelix Fietkau <nbd@nbd.name>2016-06-11 09:51:23 +0200
commitdf7af9317b9fd9532497351288ff5697fe88e40d (patch)
treee0e0b78b1a6bd8cfa7a47fff7c13b107afd7ec0b /package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch
parent69c99a423a8553cc808913fc4e3df848e4ed06d7 (diff)
downloadupstream-df7af9317b9fd9532497351288ff5697fe88e40d.tar.gz
upstream-df7af9317b9fd9532497351288ff5697fe88e40d.tar.bz2
upstream-df7af9317b9fd9532497351288ff5697fe88e40d.zip
ath10k: merge some pending stability fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch')
-rw-r--r--package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch b/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch
new file mode 100644
index 0000000000..f814ae7187
--- /dev/null
+++ b/package/kernel/mac80211/patches/307-ath10k-Clean-up-peer-when-sta-goes-away.patch
@@ -0,0 +1,32 @@
+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);