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

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

brcmfmac: drop unused pm_block vif attribute 



This attribute was added 3 years ago by
commit 3eacf866 ("brcmfmac: introduce brcmf_cfg80211_vif structure")
but it remains unused since then. It seems we can safely drop it.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent afdfdc48

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

+3 −6
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name, 


	brcmf_dbg(INFO, "Adding vif \"%s\"\n", name);



	vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP, false);

	vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP);

	if (IS_ERR(vif))

		return (struct wireless_dev *)vif;
@@ -5158,8 +5158,7 @@ static struct cfg80211_ops brcmf_cfg80211_ops = { 
};



struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,

					   enum nl80211_iftype type,

					   bool pm_block)

					   enum nl80211_iftype type)

{

	struct brcmf_cfg80211_vif *vif_walk;

	struct brcmf_cfg80211_vif *vif;
@@ -5174,8 +5173,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg, 
	vif->wdev.wiphy = cfg->wiphy;

	vif->wdev.iftype = type;



	vif->pm_block = pm_block;



	brcmf_init_prof(&vif->profile);



	if (type == NL80211_IFTYPE_AP) {
@@ -6817,7 +6814,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, 
	init_vif_event(&cfg->vif_event);

	INIT_LIST_HEAD(&cfg->vif_list);



	vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION, false);

	vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION);

	if (IS_ERR(vif))

		goto wiphy_out;

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

+1 −4
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ struct vif_saved_ie { 
 * @wdev: wireless device.

 * @profile: profile information.

 * @sme_state: SME state using enum brcmf_vif_status bits.

 * @pm_block: power-management blocked.

 * @list: linked list.

 * @mgmt_rx_reg: registered rx mgmt frame types.

 * @mbss: Multiple BSS type, set if not first AP (not relevant for P2P).
@@ -177,7 +176,6 @@ struct brcmf_cfg80211_vif { 
	struct wireless_dev wdev;

	struct brcmf_cfg80211_profile profile;

	unsigned long sme_state;

	bool pm_block;

	struct vif_saved_ie saved_ie;

	struct list_head list;

	u16 mgmt_rx_reg;
@@ -388,8 +386,7 @@ s32 brcmf_cfg80211_down(struct net_device *ndev); 
enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);



struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,

					   enum nl80211_iftype type,

					   bool pm_block);

					   enum nl80211_iftype type);

void brcmf_free_vif(struct brcmf_cfg80211_vif *vif);



s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,

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

+2 −3
Original line number Diff line number Diff line
@@ -2074,8 +2074,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p, 
	if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif)

		return ERR_PTR(-ENOSPC);



	p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE,

				  false);

	p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);

	if (IS_ERR(p2p_vif)) {

		brcmf_err("could not create discovery vif\n");

		return (struct wireless_dev *)p2p_vif;
@@ -2175,7 +2174,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, 
		return ERR_PTR(-EOPNOTSUPP);

	}



	vif = brcmf_alloc_vif(cfg, type, false);

	vif = brcmf_alloc_vif(cfg, type);

	if (IS_ERR(vif))

		return (struct wireless_dev *)vif;

	brcmf_cfg80211_arm_vif_event(cfg, vif);