Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266779
b: refs/heads/master
c: c68cdc0
h: refs/heads/master
i:
  266777: d4368df
  266775: 6c2ad62
v: v3
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Oct 14, 2011
1 parent ffdaf3c commit f0e4b80
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f588bc0c0b98cec3183333e52e3a28df2a3fc0c1
refs/heads/master: c68cdc0ff6da538226bd440ecc6a005e74e0ace6
11 changes: 7 additions & 4 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -3497,12 +3497,15 @@ brcmf_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout)

static s32
brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
s32 scan_unassoc_time, s32 scan_passive_time)
s32 scan_unassoc_time, s32 scan_passive_time)
{
s32 err = 0;
__le32 scan_assoc_tm_le = cpu_to_le32(scan_assoc_time);
__le32 scan_unassoc_tm_le = cpu_to_le32(scan_unassoc_time);
__le32 scan_passive_tm_le = cpu_to_le32(scan_passive_time);

err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_CHANNEL_TIME,
&scan_assoc_time, sizeof(scan_assoc_time));
&scan_assoc_tm_le, sizeof(scan_assoc_tm_le));
if (err) {
if (err == -EOPNOTSUPP)
WL_INFO("Scan assoc time is not supported\n");
Expand All @@ -3511,7 +3514,7 @@ brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
goto dongle_scantime_out;
}
err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_UNASSOC_TIME,
&scan_unassoc_time, sizeof(scan_unassoc_time));
&scan_unassoc_tm_le, sizeof(scan_unassoc_tm_le));
if (err) {
if (err == -EOPNOTSUPP)
WL_INFO("Scan unassoc time is not supported\n");
Expand All @@ -3521,7 +3524,7 @@ brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
}

err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_SCAN_PASSIVE_TIME,
&scan_passive_time, sizeof(scan_passive_time));
&scan_passive_tm_le, sizeof(scan_passive_tm_le));
if (err) {
if (err == -EOPNOTSUPP)
WL_INFO("Scan passive time is not supported\n");
Expand Down

0 comments on commit f0e4b80

Please sign in to comment.