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

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
...@@ -7202,7 +7202,6 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg) ...@@ -7202,7 +7202,6 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
brcmf_pno_detach(cfg); brcmf_pno_detach(cfg);
brcmf_btcoex_detach(cfg); brcmf_btcoex_detach(cfg);
wiphy_unregister(cfg->wiphy); wiphy_unregister(cfg->wiphy);
kfree(cfg->ops);
wl_deinit_priv(cfg); wl_deinit_priv(cfg);
brcmf_free_wiphy(cfg->wiphy); brcmf_free_wiphy(cfg->wiphy);
kfree(cfg); kfree(cfg);
......
...@@ -292,7 +292,6 @@ struct brcmf_cfg80211_wowl { ...@@ -292,7 +292,6 @@ struct brcmf_cfg80211_wowl {
*/ */
struct brcmf_cfg80211_info { struct brcmf_cfg80211_info {
struct wiphy *wiphy; struct wiphy *wiphy;
struct cfg80211_ops *ops;
struct brcmf_cfg80211_conf *conf; struct brcmf_cfg80211_conf *conf;
struct brcmf_p2p_info p2p; struct brcmf_p2p_info p2p;
struct brcmf_btcoex_info *btcoex; struct brcmf_btcoex_info *btcoex;
......
...@@ -1224,12 +1224,15 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) ...@@ -1224,12 +1224,15 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
return -ENOMEM; return -ENOMEM;
wiphy = wiphy_new(ops, sizeof(*drvr)); wiphy = wiphy_new(ops, sizeof(*drvr));
if (!wiphy) if (!wiphy) {
kfree(ops);
return -ENOMEM; return -ENOMEM;
}
set_wiphy_dev(wiphy, dev); set_wiphy_dev(wiphy, dev);
drvr = wiphy_priv(wiphy); drvr = wiphy_priv(wiphy);
drvr->wiphy = wiphy; drvr->wiphy = wiphy;
drvr->ops = ops;
for (i = 0; i < ARRAY_SIZE(drvr->if2bss); i++) for (i = 0; i < ARRAY_SIZE(drvr->if2bss); i++)
drvr->if2bss[i] = BRCMF_BSSIDX_INVALID; drvr->if2bss[i] = BRCMF_BSSIDX_INVALID;
...@@ -1262,12 +1265,10 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) ...@@ -1262,12 +1265,10 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
goto fail; goto fail;
} }
drvr->config->ops = ops;
return 0; return 0;
fail: fail:
brcmf_detach(dev); brcmf_detach(dev);
kfree(ops);
return ret; return ret;
} }
...@@ -1353,6 +1354,8 @@ void brcmf_detach(struct device *dev) ...@@ -1353,6 +1354,8 @@ void brcmf_detach(struct device *dev)
bus_if->drvr = NULL; bus_if->drvr = NULL;
kfree(drvr->ops);
wiphy_free(drvr->wiphy); wiphy_free(drvr->wiphy);
} }
......
...@@ -97,6 +97,7 @@ struct brcmf_pub { ...@@ -97,6 +97,7 @@ struct brcmf_pub {
struct brcmf_bus *bus_if; struct brcmf_bus *bus_if;
struct brcmf_proto *proto; struct brcmf_proto *proto;
struct wiphy *wiphy; struct wiphy *wiphy;
struct cfg80211_ops *ops;
struct brcmf_cfg80211_info *config; struct brcmf_cfg80211_info *config;
/* Internal brcmf items */ /* Internal brcmf items */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment