]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
include: remove in6.h from linux/bridge.h
authorVincent Bernat <vincent@bernat.ch>
Sun, 2 Feb 2020 13:16:27 +0000 (14:16 +0100)
committerVincent Bernat <vincent@bernat.ch>
Sun, 2 Feb 2020 13:17:43 +0000 (14:17 +0100)
Otherwise, we are redefining in6_addr on old distributions.

include/linux/if_bridge.h

index bdfecf9411320dfa84222cfd1504cf0ef85ee9e1..4c67082f940f9af7c068fb05583765f13d4a82b9 100644 (file)
@@ -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,