aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-10-22 16:55:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 15:28:49 -0400
commit9f3a9903220015f2f94d0d3945e7ae50af39dbe4 (patch)
tree5d41912a6e512ab9aab29e83f89ec514d7e61f18
parentc1179033228504fc2095bd298822584444b981fb (diff)
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: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c43
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h2
2 files changed, 0 insertions, 45 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 13971d1bbca3..da48894a3684 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2577,9 +2577,6 @@ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg)
2577 dtim_period = (u8)var; 2577 dtim_period = (u8)var;
2578 } 2578 }
2579 2579
2580 profile->beacon_interval = beacon_interval;
2581 profile->dtim_period = dtim_period;
2582
2583update_bss_info_out: 2580update_bss_info_out:
2584 WL_TRACE("Exit"); 2581 WL_TRACE("Exit");
2585 return err; 2582 return err;
@@ -5264,42 +5261,6 @@ default_conf_out:
5264 5261
5265} 5262}
5266 5263
5267static int brcmf_debugfs_add_netdev_params(struct brcmf_cfg80211_info *cfg)
5268{
5269 struct net_device *ndev = cfg_to_ndev(cfg);
5270 struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
5271 char buf[10+IFNAMSIZ];
5272 struct dentry *fd;
5273 s32 err = 0;
5274
5275 sprintf(buf, "netdev:%s", ndev->name);
5276 cfg->debugfsdir = debugfs_create_dir(buf,
5277 cfg_to_wiphy(cfg)->debugfsdir);
5278
5279 fd = debugfs_create_u16("beacon_int", S_IRUGO, cfg->debugfsdir,
5280 (u16 *)&profile->beacon_interval);
5281 if (!fd) {
5282 err = -ENOMEM;
5283 goto err_out;
5284 }
5285
5286 fd = debugfs_create_u8("dtim_period", S_IRUGO, cfg->debugfsdir,
5287 (u8 *)&profile->dtim_period);
5288 if (!fd) {
5289 err = -ENOMEM;
5290 goto err_out;
5291 }
5292
5293err_out:
5294 return err;
5295}
5296
5297static void brcmf_debugfs_remove_netdev(struct brcmf_cfg80211_info *cfg)
5298{
5299 debugfs_remove_recursive(cfg->debugfsdir);
5300 cfg->debugfsdir = NULL;
5301}
5302
5303static s32 __brcmf_cfg80211_up(struct brcmf_cfg80211_info *cfg) 5264static s32 __brcmf_cfg80211_up(struct brcmf_cfg80211_info *cfg)
5304{ 5265{
5305 struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg)); 5266 struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
@@ -5307,8 +5268,6 @@ static s32 __brcmf_cfg80211_up(struct brcmf_cfg80211_info *cfg)
5307 5268
5308 set_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state); 5269 set_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state);
5309 5270
5310 brcmf_debugfs_add_netdev_params(cfg);
5311
5312 err = brcmf_config_dongle(cfg); 5271 err = brcmf_config_dongle(cfg);
5313 if (err) 5272 if (err)
5314 return err; 5273 return err;
@@ -5343,8 +5302,6 @@ static s32 __brcmf_cfg80211_down(struct brcmf_cfg80211_info *cfg)
5343 brcmf_abort_scanning(cfg); 5302 brcmf_abort_scanning(cfg);
5344 clear_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state); 5303 clear_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state);
5345 5304
5346 brcmf_debugfs_remove_netdev(cfg);
5347
5348 return 0; 5305 return 0;
5349} 5306}
5350 5307
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index fca288bcaa3d..851403f34ebd 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -228,8 +228,6 @@ struct brcmf_cfg80211_profile {
228 u32 mode; 228 u32 mode;
229 struct brcmf_ssid ssid; 229 struct brcmf_ssid ssid;
230 u8 bssid[ETH_ALEN]; 230 u8 bssid[ETH_ALEN];
231 u16 beacon_interval;
232 u8 dtim_period;
233 struct brcmf_cfg80211_security sec; 231 struct brcmf_cfg80211_security sec;
234 struct brcmf_cfg80211_ibss ibss; 232 struct brcmf_cfg80211_ibss ibss;
235 s32 band; 233 s32 band;