diff options
Diffstat (limited to 'net/mac80211/wme.c')
-rw-r--r-- | net/mac80211/wme.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index fcc8921722f4..5b8a157975a3 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
@@ -94,8 +94,6 @@ static inline int wme_downgrade_ac(struct sk_buff *skb) | |||
94 | static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) | 94 | static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) |
95 | { | 95 | { |
96 | struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); | 96 | struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr); |
97 | struct ieee80211_tx_packet_data *pkt_data = | ||
98 | (struct ieee80211_tx_packet_data *) skb->cb; | ||
99 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; | 97 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; |
100 | unsigned short fc = le16_to_cpu(hdr->frame_control); | 98 | unsigned short fc = le16_to_cpu(hdr->frame_control); |
101 | int qos; | 99 | int qos; |
@@ -108,12 +106,8 @@ static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) | |||
108 | return IEEE80211_TX_QUEUE_DATA0; | 106 | return IEEE80211_TX_QUEUE_DATA0; |
109 | } | 107 | } |
110 | 108 | ||
111 | if (unlikely(pkt_data->flags & IEEE80211_TXPD_MGMT_IFACE)) { | 109 | if (0 /* injected */) { |
112 | /* Data frames from hostapd (mainly, EAPOL) use AC_VO | 110 | /* use AC from radiotap */ |
113 | * and they will include QoS control fields if | ||
114 | * the target STA is using WME. */ | ||
115 | skb->priority = 7; | ||
116 | return ieee802_1d_to_ac[skb->priority]; | ||
117 | } | 111 | } |
118 | 112 | ||
119 | /* is this a QoS frame? */ | 113 | /* is this a QoS frame? */ |