Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66831075 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1062904c

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+4 −4
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ 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 */
@@ -483,7 +483,7 @@ static s32 brcmf_do_iscan(struct brcmf_cfg80211_priv *cfg_priv) 


	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) {
@@ -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;
@@ -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) {