diff options
author | Vivek Natarajan <nataraja@qca.qualcomm.com> | 2012-05-02 05:25:25 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-05-04 14:45:37 -0400 |
commit | f3740572512075839e1a7ebde970081106fed3f0 (patch) | |
tree | 4d239eeecb460c6299cdf0abdbfb2cf21cc5d269 /drivers/net | |
parent | 93b42cae16d7af185ebdee0f4e85feccfd40d986 (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c index 102477d5900f..ee8ec2394c2c 100644 --- 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, | |||
290 | layer2_priority); | 290 | layer2_priority); |
291 | } else | 291 | } else |
292 | usr_pri = layer2_priority & 0x7; | 292 | usr_pri = layer2_priority & 0x7; |
293 | |||
294 | /* | ||
295 | * Queue the EAPOL frames in the same WMM_AC_VO queue | ||
296 | * as that of management frames. | ||
297 | */ | ||
298 | if (skb->protocol == cpu_to_be16(ETH_P_PAE)) | ||
299 | usr_pri = WMI_VOICE_USER_PRIORITY; | ||
293 | } | 300 | } |
294 | 301 | ||
295 | /* | 302 | /* |
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index 996614038fd4..9076bec3a2ba 100644 --- 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 { | |||
106 | #define WMM_AC_VI 2 /* video */ | 106 | #define WMM_AC_VI 2 /* video */ |
107 | #define WMM_AC_VO 3 /* voice */ | 107 | #define WMM_AC_VO 3 /* voice */ |
108 | 108 | ||
109 | #define WMI_VOICE_USER_PRIORITY 0x7 | ||
110 | |||
109 | struct wmi { | 111 | struct wmi { |
110 | u16 stream_exist_for_ac[WMM_NUM_AC]; | 112 | u16 stream_exist_for_ac[WMM_NUM_AC]; |
111 | u8 fat_pipe_exist; | 113 | u8 fat_pipe_exist; |