aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-10-12 14:51:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-14 14:48:18 -0400
commitc68cdc0ff6da538226bd440ecc6a005e74e0ace6 (patch)
tree84ab3d5b8a4ac2a597a09752ce7a407cd4f9539c /drivers/net/wireless
parentf588bc0c0b98cec3183333e52e3a28df2a3fc0c1 (diff)
brcm80211: use endian annotation for scan time configuration
For scanning several timeout parameters are configured on the device. These parameters have been endian annotated and converted appropriately. 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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 8fc81739e6b..1b09be0f456 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3497,12 +3497,15 @@ dongle_rom_out:
3497 3497
3498static s32 3498static s32
3499brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time, 3499brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
3500 s32 scan_unassoc_time, s32 scan_passive_time) 3500 s32 scan_unassoc_time, s32 scan_passive_time)
3501{ 3501{
3502 s32 err = 0; 3502 s32 err = 0;
3503 __le32 scan_assoc_tm_le = cpu_to_le32(scan_assoc_time);
3504 __le32 scan_unassoc_tm_le = cpu_to_le32(scan_unassoc_time);
3505 __le32 scan_passive_tm_le = cpu_to_le32(scan_passive_time);
3503 3506
3504 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_CHANNEL_TIME, 3507 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_CHANNEL_TIME,
3505 &scan_assoc_time, sizeof(scan_assoc_time)); 3508 &scan_assoc_tm_le, sizeof(scan_assoc_tm_le));
3506 if (err) { 3509 if (err) {
3507 if (err == -EOPNOTSUPP) 3510 if (err == -EOPNOTSUPP)
3508 WL_INFO("Scan assoc time is not supported\n"); 3511 WL_INFO("Scan assoc time is not supported\n");
@@ -3511,7 +3514,7 @@ brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
3511 goto dongle_scantime_out; 3514 goto dongle_scantime_out;
3512 } 3515 }
3513 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_UNASSOC_TIME, 3516 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_UNASSOC_TIME,
3514 &scan_unassoc_time, sizeof(scan_unassoc_time)); 3517 &scan_unassoc_tm_le, sizeof(scan_unassoc_tm_le));
3515 if (err) { 3518 if (err) {
3516 if (err == -EOPNOTSUPP) 3519 if (err == -EOPNOTSUPP)
3517 WL_INFO("Scan unassoc time is not supported\n"); 3520 WL_INFO("Scan unassoc time is not supported\n");
@@ -3521,7 +3524,7 @@ brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
3521 } 3524 }
3522 3525
3523 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_PASSIVE_TIME, 3526 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_PASSIVE_TIME,
3524 &scan_passive_time, sizeof(scan_passive_time)); 3527 &scan_passive_tm_le, sizeof(scan_passive_tm_le));
3525 if (err) { 3528 if (err) {
3526 if (err == -EOPNOTSUPP) 3529 if (err == -EOPNOTSUPP)
3527 WL_INFO("Scan passive time is not supported\n"); 3530 WL_INFO("Scan passive time is not supported\n");