net: hsr: fix debugfs path to support multiple interfaces

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>

diff --git a/net/hsr/hsr_debugfs.c b/net/hsr/hsr_debugfs.c
index b5a955013976a113b0e0858c5cc4b80eb9c453e8..94447974a3c05d735cad2d26648f432a45e3697a 100644 (file)
--- a/net/hsr/hsr_debugfs.c
+++ b/net/hsr/hsr_debugfs.c
@@ -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

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 58cf500ebf945b66ca6e5e8f822382b914ac58c5..15c72065df79103fa78ee47db8f076a62529b055 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -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;
 

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index 6cd4dff58727aea9ab1d52fd9d213e47fe1b2e1c..96fac696a1e1a602fdf46c4df74016b7baf50008 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -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;
 }