]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
bridge: include in6.h in if_bridge.h for struct in6_addr
authorGregory Fong <gregory.0xf0@gmail.com>
Tue, 4 Nov 2014 19:21:21 +0000 (11:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Nov 2014 22:13:34 +0000 (17:13 -0500)
commit66f1c44887ba4f47d617f8ae21cf8e04e1892bd7
tree669fbc755c6062740c6542ccdb855ca9ddfd9315
parent1f37bf87aa7523d28e7e4c4f7bb5dba98faa3e00
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 <colin@mageia.org>
Reported-by: Christiaan Welvaart <cjw@daneel.dyndns.org>
Reported-by: Thomas Backlund <tmb@mageia.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Gregory Fong <gregory.0xf0@gmail.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/if_bridge.h