Skip to contentSkip to conversation

hsr: Fix a compilation error

PATCH Applied xiaofeng.yan 3 participants 3 messages Jan 20, 2020 – Jan 22, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

Fixes 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed")
---
 net/hsr/hsr_main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/hsr/hsr_main.h +1 -1
index d40de84..754d84b 100644
@@ -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,
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw

From: "xiaofeng.yan" <[email protected]>
Date: Mon, 20 Jan 2020 14:26:39 +0800

Quoted 8 lines

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)

Quoted 5 lines

So Removed one void.

Fixes 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed")

Applied, thank you.

#2 lore raw

Am Montag, 20. Januar 2020, 13:21:36 schrieb David Miller:

Quoted 12 lines

From: "xiaofeng.yan" <[email protected]>
Date: Mon, 20 Jan 2020 14:26:39 +0800

Quoted 9 lines

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)

Quoted 7 lines
Quoted 5 lines

So Removed one void.

Fixes 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is

changed") Signed-off-by: xiaofeng.yan <[email protected]>

Applied, thank you.

This seems to be the same fix as the fix from Arnd Bergmann:

	https://lkml.org/lkml/2020/1/7/876

which was applied to net-next:

https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=b9ae51273655a72a12fba730843fd72fb132735a

Regards,

Signature · 3 lines
Wolfgang Walter
Studentenwerk München
Anstalt des öffentlichen Rechts