diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-03-31 11:45:11 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-03-31 11:45:11 -0500 |
| commit | e365c882ed38dbbe1a6ff4ed72414835390368a6 (patch) | |
| tree | 82eb481631cd22d3767f638cd4d0a3b2598ab61e /net/mac80211/wme.c | |
| parent | 9ce234e1ee801968b204c3b9caa75ce0a76ed1c2 (diff) | |
| parent | 10f8245e0d3650144b034142c8f91e5d15c392ab (diff) | |
Merge tag 'v3.10.34' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.34-finallinux-lng-3.10.34-2014.04
This is the 3.10.34 stable release
Diffstat (limited to 'net/mac80211/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index afba19cb6f87..a282fddf8b00 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -153,6 +153,11 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, return IEEE80211_AC_BE; } + if (skb->protocol == sdata->control_port_protocol) { + skb->priority = 7; + return ieee80211_downgrade_queue(sdata, skb); + } + /* use the data classifier to determine what 802.1d tag the * data frame has */ skb->priority = cfg80211_classify8021d(skb); |