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 <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 93eff7294f99f07e139098a3d3883b56f00d16a6..c61ffe4bfaf0ddd6eadda76cca1c09b0459e2e67 100644 (file)
--- 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) {