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

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

brcmfmac: remove debugfs functionality from wl_cfg80211.c 



In wl_cfg80211.c debugfs directory was created to expose
dtim_period and beacon_interval. However, this can be easily
obtained using iw so it is removed from the driver.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c1179033

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

+0 −43
Original line number Diff line number Diff line
@@ -2577,9 +2577,6 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg) 
		dtim_period = (u8)var;

	}



	profile->beacon_interval = beacon_interval;

	profile->dtim_period = dtim_period;



update_bss_info_out:

	WL_TRACE("Exit");

	return err;
@@ -5264,42 +5261,6 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg) 


}



static int brcmf_debugfs_add_netdev_params(struct brcmf_cfg80211_info *cfg)

{

	struct net_device *ndev = cfg_to_ndev(cfg);

	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);

	char buf[10+IFNAMSIZ];

	struct dentry *fd;

	s32 err = 0;



	sprintf(buf, "netdev:%s", ndev->name);

	cfg->debugfsdir = debugfs_create_dir(buf,

					cfg_to_wiphy(cfg)->debugfsdir);



	fd = debugfs_create_u16("beacon_int", S_IRUGO, cfg->debugfsdir,

		(u16 *)&profile->beacon_interval);

	if (!fd) {

		err = -ENOMEM;

		goto err_out;

	}



	fd = debugfs_create_u8("dtim_period", S_IRUGO, cfg->debugfsdir,

		(u8 *)&profile->dtim_period);

	if (!fd) {

		err = -ENOMEM;

		goto err_out;

	}



err_out:

	return err;

}



static void brcmf_debugfs_remove_netdev(struct brcmf_cfg80211_info *cfg)

{

	debugfs_remove_recursive(cfg->debugfsdir);

	cfg->debugfsdir = NULL;

}



static s32 __brcmf_cfg80211_up(struct brcmf_cfg80211_info *cfg)

{

	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
@@ -5307,8 +5268,6 @@ static s32 __brcmf_cfg80211_up(struct brcmf_cfg80211_info *cfg) 


	set_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state);



	brcmf_debugfs_add_netdev_params(cfg);



	err = brcmf_config_dongle(cfg);

	if (err)

		return err;
@@ -5343,8 +5302,6 @@ static s32 __brcmf_cfg80211_down(struct brcmf_cfg80211_info *cfg) 
	brcmf_abort_scanning(cfg);

	clear_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state);



	brcmf_debugfs_remove_netdev(cfg);



	return 0;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -228,8 +228,6 @@ struct brcmf_cfg80211_profile { 
	u32 mode;

	struct brcmf_ssid ssid;

	u8 bssid[ETH_ALEN];

	u16 beacon_interval;

	u8 dtim_period;

	struct brcmf_cfg80211_security sec;

	struct brcmf_cfg80211_ibss ibss;

	s32 band;