diff options
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 a1a53a4f2b99..5c666f7eda8f 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) | |||
154 | queue = skb_get_queue_mapping(skb); | 154 | queue = skb_get_queue_mapping(skb); |
155 | rcu_read_lock(); | 155 | rcu_read_lock(); |
156 | sta = sta_info_get(local, hdr->addr1); | 156 | sta = sta_info_get(local, hdr->addr1); |
157 | tid = skb->priority & QOS_CONTROL_TAG1D_MASK; | 157 | tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; |
158 | if (sta) { | 158 | if (sta) { |
159 | int ampdu_queue = sta->tid_to_tx_q[tid]; | 159 | int ampdu_queue = sta->tid_to_tx_q[tid]; |
160 | if ((ampdu_queue < QD_NUM(hw)) && | 160 | if ((ampdu_queue < QD_NUM(hw)) && |
@@ -181,7 +181,7 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) | |||
181 | if (ieee80211_is_data_qos(hdr->frame_control)) { | 181 | if (ieee80211_is_data_qos(hdr->frame_control)) { |
182 | u8 *p = ieee80211_get_qos_ctl(hdr); | 182 | u8 *p = ieee80211_get_qos_ctl(hdr); |
183 | u8 ack_policy = 0; | 183 | u8 ack_policy = 0; |
184 | tid = skb->priority & QOS_CONTROL_TAG1D_MASK; | 184 | tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; |
185 | if (local->wifi_wme_noack_test) | 185 | if (local->wifi_wme_noack_test) |
186 | ack_policy |= QOS_CONTROL_ACK_POLICY_NOACK << | 186 | ack_policy |= QOS_CONTROL_ACK_POLICY_NOACK << |
187 | QOS_CONTROL_ACK_POLICY_SHIFT; | 187 | QOS_CONTROL_ACK_POLICY_SHIFT; |