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

Commit 6f09be0a authored by Roland Vossen's avatar Roland Vossen Committed by John W. Linville
Browse files

brmc80211: fmac: reworked next_bss() 



Moved function to where it is called and made it more readable.

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d34bf64f

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

+10 −1
Original line number Diff line number Diff line
@@ -2057,6 +2057,15 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv, 
	return err;

}



static struct brcmf_bss_info_le *

next_bss_le(struct brcmf_scan_results *list, struct brcmf_bss_info_le *bss)

{

	if (bss == NULL)

		return list->bss_info_le;

	return (struct brcmf_bss_info_le *)((unsigned long)bss +

					    le32_to_cpu(bss->length));

}



static s32 brcmf_inform_bss(struct brcmf_cfg80211_priv *cfg_priv)

{

	struct brcmf_scan_results *bss_list;
@@ -2072,7 +2081,7 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_priv *cfg_priv) 
	}

	WL_SCAN("scanned AP count (%d)\n", bss_list->count);

	for (i = 0; i < bss_list->count && i < WL_AP_MAX; i++) {

		bi = next_bss(bss_list, bi);

		bi = next_bss_le(bss_list, bi);

		err = brcmf_inform_single_bss(cfg_priv, bi);

		if (err)

			break;

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

+0 −9
Original line number Diff line number Diff line
@@ -352,15 +352,6 @@ brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_priv *cfg) 
	return &cfg->conn_info;

}



static inline struct brcmf_bss_info_le *

next_bss(struct brcmf_scan_results *list, struct brcmf_bss_info_le *bss)

{

	return bss = bss ?

		(struct brcmf_bss_info_le *)((unsigned long)bss +

				       le32_to_cpu(bss->length)) :

		list->bss_info_le;

}



extern struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,

							struct device *busdev,

							void *data);