lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: hsr: fix debugfs path to support multiple interfaces

Browse Source 
Fix the path of hsr debugfs root directory to use the net device
name so that it can work with multiple interfaces. While at it,
also fix some typos.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Murali Karicheri 2019-04-15 11:36:02 -04:00 committed by David S. Miller
parent 9c5f8a19b2
commit 3271273388
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/hsr/hsr_debugfs.c
View File

@ -1,9 +1,9 @@
/*
* hsr_debugfs code
* Copyright (C) 2017 Texas Instruments Incorporated
* Copyright (C) 2019 Texas Instruments Incorporated
*
* Author(s):
* Murali Karicheri <m-karicheri2@ti.com?
* Murali Karicheri <m-karicheri2@ti.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@ -78,12 +78,12 @@ static const struct file_operations hsr_fops = {
* When debugfs is configured this routine sets up the node_table file per
* hsr device for dumping the node_table entries
*/
int hsr_debugfs_init(struct hsr_priv *priv)
int hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev)
{
int rc = -1;
struct dentry *de = NULL;
de = debugfs_create_dir("hsr", NULL);
de = debugfs_create_dir(hsr_dev->name, NULL);
if (!de) {
pr_err("Cannot create hsr debugfs root\n");
return rc;
@ -99,9 +99,8 @@ int hsr_debugfs_init(struct hsr_priv *priv)
return rc;
}
priv->node_tbl_file = de;
rc = 0;
return rc;
return 0;
}
/* hsr_debugfs_term - Tear down debugfs intrastructure

2
net/hsr/hsr_device.c
View File

@ -485,7 +485,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
goto fail;
mod_timer(&hsr->prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD));
res = hsr_debugfs_init(hsr);
res = hsr_debugfs_init(hsr, hsr_dev);
if (res)
goto fail;

5
net/hsr/hsr_main.h
View File

@ -184,10 +184,11 @@ static inline u16 hsr_get_skb_sequence_nr(struct sk_buff *skb)
}
#if IS_ENABLED(CONFIG_DEBUG_FS)
int hsr_debugfs_init(struct hsr_priv *priv);
int hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev);
void hsr_debugfs_term(struct hsr_priv *priv);
#else
static inline int hsr_debugfs_init(struct hsr_priv *priv)
static inline int hsr_debugfs_init(struct hsr_priv *priv,
struct net_device *hsr_dev)
{
return 0;
}