* [PATCH] ath6kl: Fix connect command to clear previously used IEs
@ 2011-12-15 12:16 Jouni Malinen
2011-12-23 12:44 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Jouni Malinen @ 2011-12-15 12:16 UTC (permalink / raw)
To: Kalle Valo; +Cc: linux-wireless, ath6kl-devel, Dai Shuibing
Empty IE buffer means that the new association is not supposed to
include extra IEs. Make sure any previously configured (Re)Association
Request frame IEs get cleared in such a case. This is based on a patch
from Shuibing.
Cc: Dai Shuibing <shuibing@qca.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath6kl/cfg80211.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 6c59a21..ac764c1 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -461,13 +461,13 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
}
}
- if (sme->ie && (sme->ie_len > 0)) {
- status = ath6kl_set_assoc_req_ies(vif, sme->ie, sme->ie_len);
- if (status) {
- up(&ar->sem);
- return status;
- }
- } else
+ status = ath6kl_set_assoc_req_ies(vif, sme->ie, sme->ie_len);
+ if (status) {
+ up(&ar->sem);
+ return status;
+ }
+
+ if (sme->ie == NULL || sme->ie_len == 0)
ar->connect_ctrl_flags &= ~CONNECT_WPS_FLAG;
if (test_bit(CONNECTED, &vif->flags) &&
--
1.7.4.1
--
Jouni Malinen PGP id EFC895FA
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ath6kl: Fix connect command to clear previously used IEs
2011-12-15 12:16 [PATCH] ath6kl: Fix connect command to clear previously used IEs Jouni Malinen
@ 2011-12-23 12:44 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2011-12-23 12:44 UTC (permalink / raw)
To: Jouni Malinen; +Cc: linux-wireless, ath6kl-devel, Dai Shuibing
On 12/15/2011 02:16 PM, Jouni Malinen wrote:
> Empty IE buffer means that the new association is not supposed to
> include extra IEs. Make sure any previously configured (Re)Association
> Request frame IEs get cleared in such a case. This is based on a patch
> from Shuibing.
>
> Cc: Dai Shuibing <shuibing@qca.qualcomm.com>
> Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Thanks, applied.
Kalle
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-23 12:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-15 12:16 [PATCH] ath6kl: Fix connect command to clear previously used IEs Jouni Malinen
2011-12-23 12:44 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).