]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
mac80211: clean up uAPSD TX code
authorJohannes Berg <johannes.berg@intel.com>
Tue, 27 Mar 2012 12:18:37 +0000 (14:18 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Apr 2012 18:54:06 +0000 (14:54 -0400)
Clean up the code formatting and also replace
the constant 0 by IEEE80211_AC_VO.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/tx.c

index 82389adbe5825f6ee99d9d3e32bd29e6325f87f9..b35d319cea8ff2764decf3c6a53c2ba521de0d62 100644 (file)
@@ -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) {