aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2011-07-07 17:01:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-07-08 11:42:26 -0400
commit69f7235fe69be5c644f934566f3b972988e71ee4 (patch)
tree4faab92eb7ff3c458897f3474d263ec38c34483d /drivers/net/wireless
parentcae561473e87fd01b07d980c643acd51c07e1f64 (diff)
carl9170: Implement tx_frames_pending mac80211 callback function
Implementing this callback function will cause mac80211 refrain from going to powersave state when there are still untransmitted TX frames in the queues. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/carl9170/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index d2b9f1256bc8..a61cf6781d5e 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1484,6 +1484,13 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw,
1484 } 1484 }
1485} 1485}
1486 1486
1487static bool carl9170_tx_frames_pending(struct ieee80211_hw *hw)
1488{
1489 struct ar9170 *ar = hw->priv;
1490
1491 return !!atomic_read(&ar->tx_total_queued);
1492}
1493
1487static const struct ieee80211_ops carl9170_ops = { 1494static const struct ieee80211_ops carl9170_ops = {
1488 .start = carl9170_op_start, 1495 .start = carl9170_op_start,
1489 .stop = carl9170_op_stop, 1496 .stop = carl9170_op_stop,
@@ -1504,6 +1511,7 @@ static const struct ieee80211_ops carl9170_ops = {
1504 .get_survey = carl9170_op_get_survey, 1511 .get_survey = carl9170_op_get_survey,
1505 .get_stats = carl9170_op_get_stats, 1512 .get_stats = carl9170_op_get_stats,
1506 .ampdu_action = carl9170_op_ampdu_action, 1513 .ampdu_action = carl9170_op_ampdu_action,
1514 .tx_frames_pending = carl9170_tx_frames_pending,
1507}; 1515};
1508 1516
1509void *carl9170_alloc(size_t priv_size) 1517void *carl9170_alloc(size_t priv_size)