From d2fb49a76bd7e4831371311f73e914a583cd9cca Mon Sep 17 00:00:00 2001
From: Vivek Natarajan <nataraja@qca.qualcomm.com>
Date: Wed, 2 May 2012 14:55:25 +0530
Subject: [PATCH] --- yaml --- r: 306742 b: refs/heads/master c:
 f3740572512075839e1a7ebde970081106fed3f0 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath6kl/wmi.c | 7 +++++++
 trunk/drivers/net/wireless/ath/ath6kl/wmi.h | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1bc38781462d..d5c513d180e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b42cae16d7af185ebdee0f4e85feccfd40d986
+refs/heads/master: f3740572512075839e1a7ebde970081106fed3f0
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/wmi.c b/trunk/drivers/net/wireless/ath/ath6kl/wmi.c
index 102477d5900f..ee8ec2394c2c 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -290,6 +290,13 @@ int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, u8 if_idx,
 					layer2_priority);
 		} else
 			usr_pri = layer2_priority & 0x7;
+
+		/*
+		 * Queue the EAPOL frames in the same WMM_AC_VO queue
+		 * as that of management frames.
+		 */
+		if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+			usr_pri = WMI_VOICE_USER_PRIORITY;
 	}
 
 	/*
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/wmi.h b/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
index 996614038fd4..9076bec3a2ba 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -106,6 +106,8 @@ struct wmi_data_sync_bufs {
 #define WMM_AC_VI   2		/* video */
 #define WMM_AC_VO   3		/* voice */
 
+#define WMI_VOICE_USER_PRIORITY		0x7
+
 struct wmi {
 	u16 stream_exist_for_ac[WMM_NUM_AC];
 	u8 fat_pipe_exist;