diff options
author | Zhu Yi <yi.zhu@intel.com> | 2008-05-29 04:34:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-03 15:00:19 -0400 |
commit | 95b1a8224abf6230899856753c5506a3f737a65b (patch) | |
tree | 5aa2e183871601ec6b543f622964c7ce8b57cfdf /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
parent | bd68fb6f010eb312ba20349311aceb89848ad5ff (diff) |
iwlwifi: create drivers debugfs dir under wiphy->debugfsdir
This patch creates driver's debugfs tree under wiphy->debugfsdir.
This patch fixes collision in debugfs if two or more NICs are plugged.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index c64e602bc9b6..29e16ba69cdb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -367,6 +367,7 @@ DEBUGFS_READ_FILE_OPS(tx_statistics); | |||
367 | int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | 367 | int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) |
368 | { | 368 | { |
369 | struct iwl_debugfs *dbgfs; | 369 | struct iwl_debugfs *dbgfs; |
370 | struct dentry *phyd = priv->hw->wiphy->debugfsdir; | ||
370 | 371 | ||
371 | dbgfs = kzalloc(sizeof(struct iwl_debugfs), GFP_KERNEL); | 372 | dbgfs = kzalloc(sizeof(struct iwl_debugfs), GFP_KERNEL); |
372 | if (!dbgfs) { | 373 | if (!dbgfs) { |
@@ -375,7 +376,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
375 | 376 | ||
376 | priv->dbgfs = dbgfs; | 377 | priv->dbgfs = dbgfs; |
377 | dbgfs->name = name; | 378 | dbgfs->name = name; |
378 | dbgfs->dir_drv = debugfs_create_dir(name, NULL); | 379 | dbgfs->dir_drv = debugfs_create_dir(name, phyd); |
379 | if (!dbgfs->dir_drv || IS_ERR(dbgfs->dir_drv)){ | 380 | if (!dbgfs->dir_drv || IS_ERR(dbgfs->dir_drv)){ |
380 | goto err; | 381 | goto err; |
381 | } | 382 | } |