From f73b9698a764087361865a6471e0edd1adb9b78f Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 27 Mar 2012 14:18:37 +0200 Subject: [PATCH] --- yaml --- r: 300672 b: refs/heads/master c: 4875d30df594eb47746b16073067e316968edd53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a8086138aa04..52d81a67a35e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98aed9fd0104ef2d8e6b5154c9713e0e27e5f9c8 +refs/heads/master: 4875d30df594eb47746b16073067e316968edd53 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 82389adbe582..b35d319cea8f 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -230,9 +230,9 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx) * changed via debugfs, user needs to reassociate manually to have * everything in sync. */ - if ((ifmgd->flags & IEEE80211_STA_UAPSD_ENABLED) - && (ifmgd->uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO) - && skb_get_queue_mapping(tx->skb) == 0) + if ((ifmgd->flags & IEEE80211_STA_UAPSD_ENABLED) && + (ifmgd->uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO) && + skb_get_queue_mapping(tx->skb) == IEEE80211_AC_VO) return TX_CONTINUE; if (local->hw.conf.flags & IEEE80211_CONF_PS) {