From: greearb@candelatech.com
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org, Ben Greear <greearb@candelatech.com>
Subject: [PATCH v2 4/5] ath10k: Clean up peer when sta goes away.
Date: Fri, 1 Apr 2016 14:12:11 -0700 [thread overview]
Message-ID: <1459545132-11295-4-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1459545132-11295-1-git-send-email-greearb@candelatech.com>
From: Ben Greear <greearb@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 <greearb@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
next prev parent reply other threads:[~2016-04-01 21:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 21:12 [PATCH v2 1/5] ath10k: Ensure txrx-compl-task is stopped when cleaning htt-tx greearb
2016-04-01 21:12 ` [PATCH v2 2/5] ath10k: Ensure peer_map references are cleaned up greearb
2016-04-01 21:12 ` [PATCH v2 3/5] ath10k: Add WARN_ON if we over-write peer-map pointer greearb
2016-05-10 7:12 ` Mohammed Shafi Shajakhan
2016-05-10 14:41 ` Ben Greear
2016-05-10 16:38 ` Mohammed Shafi Shajakhan
2016-07-08 6:48 ` [v2,3/5] " Kalle Valo
2016-04-01 21:12 ` greearb [this message]
2016-04-01 21:12 ` [PATCH v2 5/5] ath10k: Fix deadlock when peer cannot be created greearb
2016-05-09 17:19 ` Ben Greear
2016-05-09 17:54 ` Manoharan, Rajkumar
2016-05-09 17:58 ` Ben Greear
2016-05-13 14:07 ` Valo, Kalle
2016-06-06 17:24 ` [v2,5/5] " Kalle Valo
2016-05-10 6:48 ` [PATCH v2 1/5] ath10k: Ensure txrx-compl-task is stopped when cleaning htt-tx Mohammed Shafi Shajakhan
2016-05-10 14:39 ` Ben Greear
2016-05-10 16:36 ` Mohammed Shafi Shajakhan
2016-07-08 6:43 ` [v2, " Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459545132-11295-4-git-send-email-greearb@candelatech.com \
--to=greearb@candelatech.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).