diff options
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 11 |
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 8fc81739e6b7..1b09be0f4564 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 | ||
3498 | static s32 | 3498 | static s32 |
3499 | brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time, | 3499 | brcmf_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"); |