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

Commit ba76ff25 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: move "cfg80211_ops" pointer to another struct 



This moves "ops" pointer from "struct brcmf_cfg80211_info" to the
"struct brcmf_pub". This movement makes it possible to allocate wiphy
without attaching cfg80211 (brcmf_cfg80211_attach()). It's required for
later separation of wiphy allocation and driver initialization.

While at it fix also an unlikely memory leak in the brcmf_attach().

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 172ca830

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+0 −1
Original line number Diff line number Diff line
@@ -7202,7 +7202,6 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg) 
	brcmf_pno_detach(cfg);

	brcmf_btcoex_detach(cfg);

	wiphy_unregister(cfg->wiphy);

	kfree(cfg->ops);

	wl_deinit_priv(cfg);

	brcmf_free_wiphy(cfg->wiphy);

	kfree(cfg);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ struct brcmf_cfg80211_wowl { 
 */

struct brcmf_cfg80211_info {

	struct wiphy *wiphy;

	struct cfg80211_ops *ops;

	struct brcmf_cfg80211_conf *conf;

	struct brcmf_p2p_info p2p;

	struct brcmf_btcoex_info *btcoex;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+6 −3
Original line number Diff line number Diff line
@@ -1224,12 +1224,15 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) 
		return -ENOMEM;



	wiphy = wiphy_new(ops, sizeof(*drvr));

	if (!wiphy)

	if (!wiphy) {

		kfree(ops);

		return -ENOMEM;

	}



	set_wiphy_dev(wiphy, dev);

	drvr = wiphy_priv(wiphy);

	drvr->wiphy = wiphy;

	drvr->ops = ops;



	for (i = 0; i < ARRAY_SIZE(drvr->if2bss); i++)

		drvr->if2bss[i] = BRCMF_BSSIDX_INVALID;
@@ -1262,12 +1265,10 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) 
		goto fail;

	}



	drvr->config->ops = ops;

	return 0;



fail:

	brcmf_detach(dev);

	kfree(ops);



	return ret;

}
@@ -1353,6 +1354,8 @@ void brcmf_detach(struct device *dev) 


	bus_if->drvr = NULL;



	kfree(drvr->ops);



	wiphy_free(drvr->wiphy);

}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ struct brcmf_pub { 
	struct brcmf_bus *bus_if;

	struct brcmf_proto *proto;

	struct wiphy *wiphy;

	struct cfg80211_ops *ops;

	struct brcmf_cfg80211_info *config;



	/* Internal brcmf items */