Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266775
b: refs/heads/master
c: 6683107
h: refs/heads/master
i:
  266773: 4b8e0bb
  266771: c1c07d5
  266767: 8d4b5f8
v: v3
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Oct 14, 2011
1 parent 587fd4c commit 6c2ad62
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 1062904c9b053ed4f2b77900aacc122f68febb0b
refs/heads/master: 668310754f32b6c0a421361a3e45767a4b5f5c05
8 changes: 4 additions & 4 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,15 +475,15 @@ static s32 brcmf_do_iscan(struct brcmf_cfg80211_priv *cfg_priv)
struct brcmf_cfg80211_iscan_ctrl *iscan = cfg_to_iscan(cfg_priv);
struct net_device *ndev = cfg_to_ndev(cfg_priv);
struct brcmf_ssid ssid;
s32 passive_scan;
__le32 passive_scan;
s32 err = 0;

/* Broadcast scan by default */
memset(&ssid, 0, sizeof(ssid));

iscan->state = WL_ISCAN_STATE_SCANING;

passive_scan = cfg_priv->active_scan ? 0 : 1;
passive_scan = cfg_priv->active_scan ? 0 : cpu_to_le32(1);
err = brcmf_exec_dcmd(cfg_to_ndev(cfg_priv), BRCMF_C_SET_PASSIVE_SCAN,
&passive_scan, sizeof(passive_scan));
if (err) {
Expand Down Expand Up @@ -511,7 +511,7 @@ __brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
struct brcmf_cfg80211_priv *cfg_priv = ndev_to_cfg(ndev);
struct cfg80211_ssid *ssids;
struct brcmf_cfg80211_scan_req *sr = cfg_priv->scan_req_int;
s32 passive_scan;
__le32 passive_scan;
bool iscan_req;
bool spec_scan;
s32 err = 0;
Expand Down Expand Up @@ -567,7 +567,7 @@ __brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
WL_SCAN("Broadcast scan\n");
}

passive_scan = cfg_priv->active_scan ? 0 : 1;
passive_scan = cfg_priv->active_scan ? 0 : cpu_to_le32(1);
err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_PASSIVE_SCAN,
&passive_scan, sizeof(passive_scan));
if (err) {
Expand Down

0 comments on commit 6c2ad62

Please sign in to comment.