[15/15] mac80211: make sure TDLS teardown packet is sent on time

Commit Message

Arik Nemtsov July 17, 2014, 2:14 p.m. UTC

From: Liad Kaufman <[e-mail]>

Since the teardown packet is created while the queues are
stopped, it isn't sent immediately, but rather is pending.
To be sure that when we flush the queues prior to destroying
the station we also send this packet - the tasklet handling
pending packets is invoked to flush the packets.

Signed-off-by: Liad Kaufman <[e-mail]>
Reviewed-by: ArikX Nemtsov <[e-mail]>
Reviewed-by: Johannes Berg <[e-mail]>
---
 net/mac80211/tdls.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index 50d0e06..1b21050 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -836,6 +836,17 @@  int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
 		ret = 0;
 		break;
 	case NL80211_TDLS_DISABLE_LINK:
+		/*
+		 * The teardown message in ieee80211_tdls_mgmt_teardown() was
+		 * created while the queues were stopped, so it might still be
+		 * pending. Before flushing the queues we need to be sure the
+		 * message is handled by the tasklet handling pending messages,
+		 * otherwise we might start destroying the station before
+		 * sending the teardown packet.
+		 * Note that this only forces the tasklet to flush pendings -
+		 * not to stop the tasklet from rescheduling itself.
+		 */
+		tasklet_kill(&local->tx_pending_tasklet);
 		/* flush a potentially queued teardown packet */
 		ieee80211_flush_queues(local, sdata);