diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-08-28 17:01:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:48 -0400 |
commit | e8bf96495cd67090b4900ddaf8e8672a17ec39fa (patch) | |
tree | 00630b109a928733217dc25ea1f5aefbf8b48a46 /net/mac80211/wme.c | |
parent | cf966838cd5596ca61d3e9949050442a943f6238 (diff) |
[MAC80211]: Remove bitfields from struct ieee80211_tx_packet_data
remove bitfields from struct ieee80211_tx_packet_data
[Johannes: completely clear flags in ieee80211_remove_tx_extra]
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 0f11ccd30a36..d303229249e7 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
@@ -108,7 +108,7 @@ static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) | |||
108 | return IEEE80211_TX_QUEUE_DATA0; | 108 | return IEEE80211_TX_QUEUE_DATA0; |
109 | } | 109 | } |
110 | 110 | ||
111 | if (unlikely(pkt_data->mgmt_iface)) { | 111 | if (unlikely(pkt_data->flags & IEEE80211_TXPD_MGMT_IFACE)) { |
112 | /* Data frames from hostapd (mainly, EAPOL) use AC_VO | 112 | /* Data frames from hostapd (mainly, EAPOL) use AC_VO |
113 | * and they will include QoS control fields if | 113 | * and they will include QoS control fields if |
114 | * the target STA is using WME. */ | 114 | * the target STA is using WME. */ |
@@ -153,7 +153,7 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) | |||
153 | struct Qdisc *qdisc; | 153 | struct Qdisc *qdisc; |
154 | int err, queue; | 154 | int err, queue; |
155 | 155 | ||
156 | if (pkt_data->requeue) { | 156 | if (pkt_data->flags & IEEE80211_TXPD_REQUEUE) { |
157 | skb_queue_tail(&q->requeued[pkt_data->queue], skb); | 157 | skb_queue_tail(&q->requeued[pkt_data->queue], skb); |
158 | qd->q.qlen++; | 158 | qd->q.qlen++; |
159 | return 0; | 159 | return 0; |