aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-17 21:01:08 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-06-17 21:01:08 -0400
commit9ae4c81e76a9ae5892b1da7f60ae974a0803f1d2 (patch)
treeb807e3d30d8041f838c61704baf5861c3530d4b8 /drivers/net/wireless/rtlwifi/rtl8192se/trx.c
parent74e050830fb1d79bb8bfb4c752614b32d7f983f6 (diff)
parentbe67db109090b17b56eb8eb2190cd70700f107aa (diff)
Merge tag 'v3.10.40' into v3.10-rt
This is the 3.10.40 stable release
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se/trx.c')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192se/trx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 7d0f2e20f1a2..c240b7591cf0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -49,6 +49,12 @@ static u8 _rtl92se_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 skb_queue)
if (ieee80211_is_nullfunc(fc))
return QSLT_HIGH;
+ /* Kernel commit 1bf4bbb4024dcdab changed EAPOL packets to use
+ * queue V0 at priority 7; however, the RTL8192SE appears to have
+ * that queue at priority 6
+ */
+ if (skb->priority == 7)
+ return QSLT_VO;
return skb->priority;
}