| From: Hante Meuleman <meuleman@broadcom.com> |
| Date: Tue, 11 Sep 2012 21:16:48 +0200 |
| Subject: brcmfmac: Fix big endian host configuration data. |
| |
| commit e020a83d0942a5aceac35986500c9834efc8707d upstream. |
| |
| Fixes big endian host configuration parameters. |
| |
| Reviewed-by: Arend Van Spriel <arend@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> |
| [bwh: Backported to 3.2: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 26 ++++++++++++-------- |
| 1 file changed, 16 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c |
| +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c |
| @@ -775,8 +775,11 @@ static void brcmf_c_arp_offload_set(stru |
| { |
| char iovbuf[32]; |
| int retcode; |
| + __le32 arp_mode_le; |
| |
| - brcmf_c_mkiovar("arp_ol", (char *)&arp_mode, 4, iovbuf, sizeof(iovbuf)); |
| + arp_mode_le = cpu_to_le32(arp_mode); |
| + brcmf_c_mkiovar("arp_ol", (char *)&arp_mode_le, 4, iovbuf, |
| + sizeof(iovbuf)); |
| retcode = brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, |
| iovbuf, sizeof(iovbuf)); |
| retcode = retcode >= 0 ? 0 : retcode; |
| @@ -792,8 +795,11 @@ static void brcmf_c_arp_offload_enable(s |
| { |
| char iovbuf[32]; |
| int retcode; |
| + __le32 arp_enable_le; |
| |
| - brcmf_c_mkiovar("arpoe", (char *)&arp_enable, 4, |
| + arp_enable_le = cpu_to_le32(arp_enable); |
| + |
| + brcmf_c_mkiovar("arpoe", (char *)&arp_enable_le, 4, |
| iovbuf, sizeof(iovbuf)); |
| retcode = brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, |
| iovbuf, sizeof(iovbuf)); |
| @@ -814,10 +820,10 @@ int brcmf_c_preinit_dcmds(struct brcmf_p |
| char buf[128], *ptr; |
| u32 dongle_align = BRCMF_SDALIGN; |
| u32 glom = 0; |
| - u32 roaming = 1; |
| - uint bcn_timeout = 3; |
| - int scan_assoc_time = 40; |
| - int scan_unassoc_time = 40; |
| + __le32 roaming_le = cpu_to_le32(1); |
| + __le32 bcn_timeout_le = cpu_to_le32(3); |
| + __le32 scan_assoc_time_le = cpu_to_le32(40); |
| + __le32 scan_unassoc_time_le = cpu_to_le32(40); |
| int i; |
| |
| brcmf_os_proto_block(drvr); |
| @@ -852,14 +858,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_p |
| |
| /* Setup timeout if Beacons are lost and roam is off to report |
| link down */ |
| - brcmf_c_mkiovar("bcn_timeout", (char *)&bcn_timeout, 4, iovbuf, |
| + brcmf_c_mkiovar("bcn_timeout", (char *)&bcn_timeout_le, 4, iovbuf, |
| sizeof(iovbuf)); |
| brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf, |
| sizeof(iovbuf)); |
| |
| /* Enable/Disable build-in roaming to allowed ext supplicant to take |
| of romaing */ |
| - brcmf_c_mkiovar("roam_off", (char *)&roaming, 4, |
| + brcmf_c_mkiovar("roam_off", (char *)&roaming_le, 4, |
| iovbuf, sizeof(iovbuf)); |
| brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf, |
| sizeof(iovbuf)); |
| @@ -874,9 +880,9 @@ int brcmf_c_preinit_dcmds(struct brcmf_p |
| sizeof(iovbuf)); |
| |
| brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_SCAN_CHANNEL_TIME, |
| - (char *)&scan_assoc_time, sizeof(scan_assoc_time)); |
| + (char *)&scan_assoc_time_le, sizeof(scan_assoc_time_le)); |
| brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_SCAN_UNASSOC_TIME, |
| - (char *)&scan_unassoc_time, sizeof(scan_unassoc_time)); |
| + (char *)&scan_unassoc_time_le, sizeof(scan_unassoc_time_le)); |
| |
| /* Set and enable ARP offload feature */ |
| brcmf_c_arp_offload_set(drvr, BRCMF_ARPOL_MODE); |