ath6kl_sdio: Fix the EAPOL out of order issue

Send the EAPOL and management frames in the same AC_VO queue. The issue
happens when the AP supports QOS, the management frames are sent to AC_VO
queue and EAP frame goes to AC_BE queue. Even though the EAP frame is
queued before the DEAUTH management frame, as they are queued on different
h/w queues, order of delivery between these frames cannot be controlled.

This fixes the connection failure seen in P2P case.

Signed-off-by: Vivek Natarajan <nataraja@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 102477d5900fdd32502529061e1efad271f7c8dd..ee8ec2394c2cc453962178d4cdf78dfa866cd689 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/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/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 996614038fd4f0fcfbc61e8e0b004b82b70c2125..9076bec3a2ba29b430f42fc6607038420fcddbb0 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/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;