From: Vincent Bernat <vincent@bernat.ch>
Date: Sun, 2 Feb 2020 13:16:27 +0000 (+0100)
Subject: include: remove in6.h from linux/bridge.h
X-Git-Tag: 1.0.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d65bc40a27f62c7397726ae1c0c353674ff1367;p=thirdparty%2Flldpd.git

include: remove in6.h from linux/bridge.h

Otherwise, we are redefining in6_addr on old distributions.
---

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index bdfecf94..4c67082f 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -16,7 +16,6 @@
 
 #include <linux/types.h>
 #include <linux/if_ether.h>
-#include <linux/in6.h>
 
 #define SYSFS_BRIDGE_ATTR	"bridge"
 #define SYSFS_BRIDGE_FDB	"brforward"
@@ -231,23 +230,6 @@ struct br_port_msg {
 	__u32 ifindex;
 };
 
-struct br_mdb_entry {
-	__u32 ifindex;
-#define MDB_TEMPORARY 0
-#define MDB_PERMANENT 1
-	__u8 state;
-#define MDB_FLAGS_OFFLOAD	(1 << 0)
-	__u8 flags;
-	__u16 vid;
-	struct {
-		union {
-			__be32	ip4;
-			struct in6_addr ip6;
-		} u;
-		__be16		proto;
-	} addr;
-};
-
 enum {
 	MDBA_SET_ENTRY_UNSPEC,
 	MDBA_SET_ENTRY,