On Fri, May 13, 2011 at 2:59 AM, Arend van Spriel <arend@xxxxxxxxxxxx> wrote:
> From: Sukesh Srikakula <sukeshs@xxxxxxxxxxxx>
>
> Last 16 bytes of the key sent by cfg80211 needs to be swapped before
> installing it to FW for TKIP encryption. This is not done for group
> key in current code, which is corrected with this fix.
>
> Cc: devel@xxxxxxxxxxxxxxxxxxxxxx
> Cc: linux-wireless@xxxxxxxxxxxxxxx
> Cc: Grant Grundler <grundler@xxxxxxxxxxxx>
Thanks Arend+Sukesh for posting this! :)
Tested-by: Grant Grundler <grundler@xxxxxxxxxxxx>
Please add the same line for Aaron Plattner <aplattner@xxxxxxxxxx>
http://gerrit.chromium.org/gerrit/502
cheers,
grant
> Reviewed-by: Franky (Zhenhui) Lin <frankyl@xxxxxxxxxxxx>
> Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
> Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
> ---
> Âdrivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | Â Â4 ++++
> Â1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
> index b44daf9..c60fc7c 100644
> --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
> +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
> @@ -1616,6 +1616,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
> Â Â Â Âs32 val;
> Â Â Â Âs32 wsec;
> Â Â Â Âs32 err = 0;
> + Â Â Â u8 keybuf[8];
>
> Â Â Â ÂWL_DBG("key index (%d)\n", key_idx);
> Â Â Â ÂCHECK_SYS_UP();
> @@ -1644,6 +1645,9 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
> Â Â Â Â Â Â Â ÂWL_DBG("WLAN_CIPHER_SUITE_WEP104\n");
> Â Â Â Â Â Â Â Âbreak;
> Â Â Â Âcase WLAN_CIPHER_SUITE_TKIP:
> + Â Â Â Â Â Â Â memcpy(keybuf, &key.data[24], sizeof(keybuf));
> + Â Â Â Â Â Â Â memcpy(&key.data[24], &key.data[16], sizeof(keybuf));
> + Â Â Â Â Â Â Â memcpy(&key.data[16], keybuf, sizeof(keybuf));
> Â Â Â Â Â Â Â Âkey.algo = CRYPTO_ALGO_TKIP;
> Â Â Â Â Â Â Â ÂWL_DBG("WLAN_CIPHER_SUITE_TKIP\n");
> Â Â Â Â Â Â Â Âbreak;
> --
> 1.7.4.1
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
