From 1062904c9b053ed4f2b77900aacc122f68febb0b Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 12 Oct 2011 20:51:18 +0200 Subject: [PATCH] brcm80211: fix annotations in TOE configuration functions The configuration function for the TCP offload engine were not taking CPU endianess into account. Proper annotations and conversions have been added. Reported-by: Johannes Berg Reviewed-by: Roland Vossen Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel Signed-off-by: John W. Linville --- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 93eff7294f99..c61ffe4bfaf0 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -559,6 +559,7 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev) static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol) { struct brcmf_dcmd dcmd; + __le32 toe_le; char buf[32]; int ret; @@ -584,7 +585,8 @@ static int brcmf_toe_get(struct brcmf_info *drvr_priv, int ifidx, u32 *toe_ol) return ret; } - memcpy(toe_ol, buf, sizeof(u32)); + memcpy(&toe_le, buf, sizeof(u32)); + *toe_ol = le32_to_cpu(toe_le); return 0; } @@ -594,7 +596,8 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol) { struct brcmf_dcmd dcmd; char buf[32]; - int toe, ret; + int ret; + __le32 toe_le = cpu_to_le32(toe_ol); memset(&dcmd, 0, sizeof(dcmd)); @@ -604,9 +607,8 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol) dcmd.set = true; /* Set toe_ol as requested */ - strcpy(buf, "toe_ol"); - memcpy(&buf[sizeof("toe_ol")], &toe_ol, sizeof(u32)); + memcpy(&buf[sizeof("toe_ol")], &toe_le, sizeof(u32)); ret = brcmf_proto_dcmd(&drvr_priv->pub, ifidx, &dcmd, dcmd.len); if (ret < 0) { @@ -616,11 +618,10 @@ static int brcmf_toe_set(struct brcmf_info *drvr_priv, int ifidx, u32 toe_ol) } /* Enable toe globally only if any components are enabled. */ - - toe = (toe_ol != 0); + toe_le = cpu_to_le32(toe_ol != 0); strcpy(buf, "toe"); - memcpy(&buf[sizeof("toe")], &toe, sizeof(u32)); + memcpy(&buf[sizeof("toe")], &toe_le, sizeof(u32)); ret = brcmf_proto_dcmd(&drvr_priv->pub, ifidx, &dcmd, dcmd.len); if (ret < 0) { -- 2.39.2