aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-10-12 14:51:19 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-14 14:48:17 -0400
commit668310754f32b6c0a421361a3e45767a4b5f5c05 (patch)
tree79c2f9d49d6dd9d2a570d2034ce38d844c5fff3f
parent1062904c9b053ed4f2b77900aacc122f68febb0b (diff)
brcm80211: use endian annotations in scan related function
The scan related functions provide scan parameters to the device which need to be in little-endian. These parameters have been annotated and conversions were placed as needed. 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>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index fc643c1eb59..1218ed755e8 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -475,7 +475,7 @@ static s32 brcmf_do_iscan(struct brcmf_cfg80211_priv *cfg_priv)
475 struct brcmf_cfg80211_iscan_ctrl *iscan = cfg_to_iscan(cfg_priv); 475 struct brcmf_cfg80211_iscan_ctrl *iscan = cfg_to_iscan(cfg_priv);
476 struct net_device *ndev = cfg_to_ndev(cfg_priv); 476 struct net_device *ndev = cfg_to_ndev(cfg_priv);
477 struct brcmf_ssid ssid; 477 struct brcmf_ssid ssid;
478 s32 passive_scan; 478 __le32 passive_scan;
479 s32 err = 0; 479 s32 err = 0;
480 480
481 /* Broadcast scan by default */ 481 /* Broadcast scan by default */
@@ -483,7 +483,7 @@ static s32 brcmf_do_iscan(struct brcmf_cfg80211_priv *cfg_priv)
483 483
484 iscan->state = WL_ISCAN_STATE_SCANING; 484 iscan->state = WL_ISCAN_STATE_SCANING;
485 485
486 passive_scan = cfg_priv->active_scan ? 0 : 1; 486 passive_scan = cfg_priv->active_scan ? 0 : cpu_to_le32(1);
487 err = brcmf_exec_dcmd(cfg_to_ndev(cfg_priv), BRCMF_C_SET_PASSIVE_SCAN, 487 err = brcmf_exec_dcmd(cfg_to_ndev(cfg_priv), BRCMF_C_SET_PASSIVE_SCAN,
488 &passive_scan, sizeof(passive_scan)); 488 &passive_scan, sizeof(passive_scan));
489 if (err) { 489 if (err) {
@@ -511,7 +511,7 @@ __brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
511 struct brcmf_cfg80211_priv *cfg_priv = ndev_to_cfg(ndev); 511 struct brcmf_cfg80211_priv *cfg_priv = ndev_to_cfg(ndev);
512 struct cfg80211_ssid *ssids; 512 struct cfg80211_ssid *ssids;
513 struct brcmf_cfg80211_scan_req *sr = cfg_priv->scan_req_int; 513 struct brcmf_cfg80211_scan_req *sr = cfg_priv->scan_req_int;
514 s32 passive_scan; 514 __le32 passive_scan;
515 bool iscan_req; 515 bool iscan_req;
516 bool spec_scan; 516 bool spec_scan;
517 s32 err = 0; 517 s32 err = 0;
@@ -567,7 +567,7 @@ __brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
567 WL_SCAN("Broadcast scan\n"); 567 WL_SCAN("Broadcast scan\n");
568 } 568 }
569 569
570 passive_scan = cfg_priv->active_scan ? 0 : 1; 570 passive_scan = cfg_priv->active_scan ? 0 : cpu_to_le32(1);
571 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_PASSIVE_SCAN, 571 err = brcmf_exec_dcmd(ndev, BRCMF_C_SET_PASSIVE_SCAN,
572 &passive_scan, sizeof(passive_scan)); 572 &passive_scan, sizeof(passive_scan));
573 if (err) { 573 if (err) {