| From c02ba80e54ad93a43770f34118dfedac3e9ca9e0 Mon Sep 17 00:00:00 2001 |
| From: "xiaofeng.yan" <yanxiaofeng7@jd.com> |
| Date: Mon, 20 Jan 2020 14:26:39 +0800 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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, |
| -- |
| 2.7.4 |
| |
