Skip to content

Commit

Permalink
Avoid in6_addr redefinition
Browse files Browse the repository at this point in the history
in6_addr is defined both in <linux/in6.h> and in <netinet/in.h>
therefore in6_addr is being redefined. Remove the include <linux/in6.h>
from <linux/if_bridge.h>
  • Loading branch information
HoratiuVultur committed Dec 12, 2021
1 parent c09d0b8 commit a071b67
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions include/uapi/linux/if_bridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -694,26 +693,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)
#define MDB_FLAGS_FAST_LEAVE (1 << 1)
#define MDB_FLAGS_STAR_EXCL (1 << 2)
#define MDB_FLAGS_BLOCKED (1 << 3)
__u8 flags;
__u16 vid;
struct {
union {
__be32 ip4;
struct in6_addr ip6;
} u;
__be16 proto;
} addr;
};

enum {
MDBA_SET_ENTRY_UNSPEC,
MDBA_SET_ENTRY,
Expand Down

0 comments on commit a071b67

Please sign in to comment.