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

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

brcmfmac: get rid of void pointer in struct brcmf_cfg80211_priv 



Field 'pub' in struct brcmf_cfg80211_priv was types as void pointer
and filled with parameter passed in brcmf_cfg80211_attach(). This
patch makes the type specific, ie. struct brcmf_pub.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02030eb6

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

+2 −2
Original line number Diff line number Diff line
@@ -4266,7 +4266,7 @@ static void wl_deinit_priv(struct brcmf_cfg80211_priv *cfg_priv) 


struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,

						 struct device *busdev,

						 void *data)

						 struct brcmf_pub *drvr)

{

	struct wireless_dev *wdev;

	struct brcmf_cfg80211_priv *cfg_priv;
@@ -4291,7 +4291,7 @@ struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev, 
	wdev->iftype = brcmf_mode_to_nl80211_iftype(WL_MODE_BSS);

	cfg_priv = wdev_to_cfg(wdev);

	cfg_priv->wdev = wdev;

	cfg_priv->pub = data;

	cfg_priv->pub = drvr;

	ci = (struct brcmf_cfg80211_iface *)&cfg_priv->ci;

	ci->cfg_priv = cfg_priv;

	ndev->ieee80211_ptr = wdev;

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

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ struct brcmf_cfg80211_priv { 
	struct brcmf_cfg80211_pmk_list *pmk_list;

	struct work_struct event_work;

	unsigned long status;

	void *pub;

	struct brcmf_pub *pub;

	u32 channel;

	bool iscan_on;

	bool iscan_kickstart;
@@ -497,7 +497,7 @@ brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_priv *cfg) 


extern struct brcmf_cfg80211_dev *brcmf_cfg80211_attach(struct net_device *ndev,

							struct device *busdev,

							void *data);

							struct brcmf_pub *drvr);

extern void brcmf_cfg80211_detach(struct brcmf_cfg80211_dev *cfg);



/* event handler from dongle */