| From 619c5a9ad54e6bbdafd16d1cdc6c049403710540 Mon Sep 17 00:00:00 2001 |
| From: Hante Meuleman <meuleman@broadcom.com> |
| Date: Wed, 2 Jan 2013 15:12:39 +0100 |
| Subject: brcmfmac: fix parsing rsn ie for ap mode. |
| |
| From: Hante Meuleman <meuleman@broadcom.com> |
| |
| commit 619c5a9ad54e6bbdafd16d1cdc6c049403710540 upstream. |
| |
| RSN IEs got incorrectly parsed and therefore ap mode using WPA2 |
| security was not working. |
| |
| Reviewed-by: Arend Van Spriel <arend@broadcom.com> |
| Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> |
| Signed-off-by: Hante Meuleman <meuleman@broadcom.com> |
| Signed-off-by: Arend van Spriel <arend@broadcom.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c |
| +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c |
| @@ -3730,10 +3730,11 @@ brcmf_configure_wpaie(struct net_device |
| |
| len = wpa_ie->len + TLV_HDR_LEN; |
| data = (u8 *)wpa_ie; |
| - offset = 0; |
| + offset = TLV_HDR_LEN; |
| if (!is_rsn_ie) |
| offset += VS_IE_FIXED_HDR_LEN; |
| - offset += WPA_IE_VERSION_LEN; |
| + else |
| + offset += WPA_IE_VERSION_LEN; |
| |
| /* check for multicast cipher suite */ |
| if (offset + WPA_IE_MIN_OUI_LEN > len) { |