2014-11-04 19:21:21

by Gregory Fong

Subject: [PATCH] bridge: include in6.h in if_bridge.h for struct in6_addr

if_bridge.h uses struct in6_addr ip6, but wasn't including the in6.h
header. Thomas Backlund originally sent a patch to do this, but this
revealed a redefinition issue: https://lkml.org/lkml/2013/1/13/116

The redefinition issue should have been fixed by the following Linux
commits:
ee262ad827f89e2dc7851ec2986953b5b125c6bc inet: defines IPPROTO_* needed for module alias generation
cfd280c91253cc28e4919e349fa7a813b63e71e8 net: sync some IP headers with glibc

and the following glibc commit:
6c82a2f8d7c8e21e39237225c819f182ae438db3 Coordinate IPv6 definitions for Linux and glibc

so actually include the header now.

Reported-by: Colin Guthrie <[email protected]>
Reported-by: Christiaan Welvaart <[email protected]>
Reported-by: Thomas Backlund <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Cong Wang <[email protected]>
Cc: David Miller <[email protected]>
Signed-off-by: Gregory Fong <[email protected]>
---
include/uapi/linux/if_bridge.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 39f621a..da17e45 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -15,6 +15,7 @@

#include <linux/types.h>
#include <linux/if_ether.h>
+#include <linux/in6.h>

#define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward"
--
1.9.1

2014-11-05 00:40:01

by Cong Wang

Subject: Re: [PATCH] bridge: include in6.h in if_bridge.h for struct in6_addr

On Tue, Nov 4, 2014 at 11:21 AM, Gregory Fong <[email protected]> wrote:
> if_bridge.h uses struct in6_addr ip6, but wasn't including the in6.h
> header. Thomas Backlund originally sent a patch to do this, but this
> revealed a redefinition issue: https://lkml.org/lkml/2013/1/13/116
>
> The redefinition issue should have been fixed by the following Linux
> commits:
> ee262ad827f89e2dc7851ec2986953b5b125c6bc inet: defines IPPROTO_* needed for module alias generation
> cfd280c91253cc28e4919e349fa7a813b63e71e8 net: sync some IP headers with glibc
>
> and the following glibc commit:
> 6c82a2f8d7c8e21e39237225c819f182ae438db3 Coordinate IPv6 definitions for Linux and glibc
>
> so actually include the header now.
>
> Reported-by: Colin Guthrie <[email protected]>
> Reported-by: Christiaan Welvaart <[email protected]>
> Reported-by: Thomas Backlund <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: Cong Wang <[email protected]>
> Cc: David Miller <[email protected]>
> Signed-off-by: Gregory Fong <[email protected]>


Acked-by: Cong Wang <[email protected]>

Thanks for working on it!

2014-11-05 22:13:54

by David Miller

Subject: Re: [PATCH] bridge: include in6.h in if_bridge.h for struct in6_addr

From: Gregory Fong <[email protected]>
Date: Tue, 4 Nov 2014 11:21:21 -0800

> if_bridge.h uses struct in6_addr ip6, but wasn't including the in6.h
> header. Thomas Backlund originally sent a patch to do this, but this
> revealed a redefinition issue: https://lkml.org/lkml/2013/1/13/116
>
> The redefinition issue should have been fixed by the following Linux
> commits:
> ee262ad827f89e2dc7851ec2986953b5b125c6bc inet: defines IPPROTO_* needed for module alias generation
> cfd280c91253cc28e4919e349fa7a813b63e71e8 net: sync some IP headers with glibc
>
> and the following glibc commit:
> 6c82a2f8d7c8e21e39237225c819f182ae438db3 Coordinate IPv6 definitions for Linux and glibc
>
> so actually include the header now.
>
> Reported-by: Colin Guthrie <[email protected]>
> Reported-by: Christiaan Welvaart <[email protected]>
> Reported-by: Thomas Backlund <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: Cong Wang <[email protected]>
> Cc: David Miller <[email protected]>
> Signed-off-by: Gregory Fong <[email protected]>

Applied, thank you.