2020-01-20 03:26:27

by xiaofeng.yan

Subject: [PATCH] hsr: Fix a compilation error

From: "xiaofeng.yan" <[email protected]>

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.

Signed-off-by: xiaofeng.yan <[email protected]>
---
net/hsr/hsr_main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index d40de84..754d84b 100644
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -191,7 +191,7 @@ static inline u16 hsr_get_skb_sequence_nr(struct sk_buff *skb)
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,
--
1.8.3.1

2020-01-20 04:49:16

by Taehee Yoo

Subject: Re: [PATCH] hsr: Fix a compilation error

On Mon, 20 Jan 2020 at 12:26, xiaofeng.yan <[email protected]> wrote:
>
> From: "xiaofeng.yan" <[email protected]>
>

Hi Xiaofeng,

> 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.
>
> Signed-off-by: xiaofeng.yan <[email protected]>

Acked-by: Taehee Yoo <[email protected]>

I think the Fixes tag is needed.
You might have to send a v2 patch, which includes this Fixes tag.
Fixes: 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed")

Thank you!
Taehee Yoo