]> git.baikalelectronics.ru Git - kernel.git/commitdiff
hsr: Fix a compilation error
authorxiaofeng.yan <yanxiaofeng7@jd.com>
Mon, 20 Jan 2020 06:26:39 +0000 (14:26 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Jan 2020 12:18:40 +0000 (13:18 +0100)
A compliation error happen when building branch 5.5-rc7

In file included from net/hsr/hsr_main.c:12:0:
net/hsr/hsr_main.h:194:20: error: two or more data types in declaration specifiers
 static inline void void hsr_debugfs_rename(struct net_device *dev)

So Removed one void.

Fixes: 05a63fad6753 ("hsr: rename debugfs file when interface name is changed")
Signed-off-by: xiaofeng.yan <yanxiaofeng7@jd.com>
Acked-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/hsr/hsr_main.h

index d40de84a637f3af801bc4d317b396a992b7e2340..754d84b217f048fe0b61c4a8b986340b7ce3c398 100644 (file)
@@ -191,7 +191,7 @@ void hsr_debugfs_term(struct hsr_priv *priv);
 void hsr_debugfs_create_root(void);
 void hsr_debugfs_remove_root(void);
 #else
-static inline void void hsr_debugfs_rename(struct net_device *dev)
+static inline void hsr_debugfs_rename(struct net_device *dev)
 {
 }
 static inline void hsr_debugfs_init(struct hsr_priv *priv,