diff options
| author | xiaofeng.yan <yanxiaofeng7@jd.com> | 2020-01-20 14:26:39 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-29 16:45:30 +0100 |
| commit | 54b818246b03163a99e569a4cf11c0e3a312696e (patch) | |
| tree | 2e39e099a4e04caf0c95f313b5effa3e6dc5fecf /net/hsr | |
| parent | 5440678b5acbfea878d30922ba44ffecfb9487b7 (diff) | |
| download | linux-stable-54b818246b03163a99e569a4cf11c0e3a312696e.tar.gz linux-stable-54b818246b03163a99e569a4cf11c0e3a312696e.tar.bz2 linux-stable-54b818246b03163a99e569a4cf11c0e3a312696e.zip | |
hsr: Fix a compilation error
commit 80892772c4edac88c538165d26a0105f19b61c1c upstream.
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: 4c2d5e33dcd3 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index d40de84a637f..754d84b217f0 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -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, |