From 927c2fcf10d87a115a9f846c0cc0568af579c640 Mon Sep 17 00:00:00 2001
From: Vivek Natarajan <vnatarajan@atheros.com>
Date: Wed, 6 Apr 2011 11:41:11 +0530
Subject: [PATCH] --- yaml --- r: 246796 b: refs/heads/master c:
 15b91e830dbf300d653b3fe70f6ef71b568164a3 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ed06f2b3065..7556af08a3ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8306f989483e4b97a8b37dd268de6c8c6f35e75
+refs/heads/master: 15b91e830dbf300d653b3fe70f6ef71b568164a3
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index ba1c9a684eff..93b9fa2cbaf8 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -2201,6 +2201,21 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
 	ath9k_ps_restore(sc);
 }
 
+static bool ath9k_tx_frames_pending(struct ieee80211_hw *hw)
+{
+	struct ath_softc *sc = hw->priv;
+	int i;
+
+	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+		if (!ATH_TXQ_SETUP(sc, i))
+			continue;
+
+		if (ath9k_has_pending_frames(sc, &sc->tx.txq[i]))
+			return true;
+	}
+	return false;
+}
+
 struct ieee80211_ops ath9k_ops = {
 	.tx 		    = ath9k_tx,
 	.start 		    = ath9k_start,
@@ -2223,4 +2238,5 @@ struct ieee80211_ops ath9k_ops = {
 	.rfkill_poll        = ath9k_rfkill_poll_state,
 	.set_coverage_class = ath9k_set_coverage_class,
 	.flush		    = ath9k_flush,
+	.tx_frames_pending  = ath9k_tx_frames_pending,
 };