diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-07-02 11:05:34 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-08 14:15:59 -0400 |
| commit | 238f74a227fd7de8ea1bc66dcbbd36cf9920d1cb (patch) | |
| tree | 2174b8920ae81c82e7e382d1fc66e1609df11828 /net/mac80211/wme.c | |
| parent | 994d31f7430c3639b73c6ee038bd437c926b1227 (diff) | |
| download | linux-3.10-238f74a227fd7de8ea1bc66dcbbd36cf9920d1cb.tar.gz linux-3.10-238f74a227fd7de8ea1bc66dcbbd36cf9920d1cb.tar.bz2 linux-3.10-238f74a227fd7de8ea1bc66dcbbd36cf9920d1cb.zip | |
mac80211: move QOS control helpers into ieee80211.h
Also remove the WLAN_IS_QOS_DATA inline after removing the last
two users. This starts moving away from using rx->fc to using
the header frame_control directly.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index a1a53a4f2b9..5c666f7eda8 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -154,7 +154,7 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) queue = skb_get_queue_mapping(skb); rcu_read_lock(); sta = sta_info_get(local, hdr->addr1); - tid = skb->priority & QOS_CONTROL_TAG1D_MASK; + tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; if (sta) { int ampdu_queue = sta->tid_to_tx_q[tid]; if ((ampdu_queue < QD_NUM(hw)) && @@ -181,7 +181,7 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) if (ieee80211_is_data_qos(hdr->frame_control)) { u8 *p = ieee80211_get_qos_ctl(hdr); u8 ack_policy = 0; - tid = skb->priority & QOS_CONTROL_TAG1D_MASK; + tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; if (local->wifi_wme_noack_test) ack_policy |= QOS_CONTROL_ACK_POLICY_NOACK << QOS_CONTROL_ACK_POLICY_SHIFT; |