Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8fc0d9b authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of git://dev.medozas.de/linux

parents 94b27cc3 0b8ad876

include/linux/netfilter/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ header-y += xt_rateest.h 
header-y += xt_realm.h

header-y += xt_recent.h

header-y += xt_sctp.h

header-y += xt_secmark.h

header-y += xt_socket.h

header-y += xt_state.h

header-y += xt_statistic.h

header-y += xt_string.h

include/linux/netfilter_bridge/ebt_802_3.h

+12 −12
Original line number Diff line number Diff line
@@ -24,24 +24,24 @@ 


/* ui has one byte ctrl, ni has two */

struct hdr_ui {

	uint8_t dsap;

	uint8_t ssap;

	uint8_t ctrl;

	uint8_t orig[3];

	__u8 dsap;

	__u8 ssap;

	__u8 ctrl;

	__u8 orig[3];

	__be16 type;

};



struct hdr_ni {

	uint8_t dsap;

	uint8_t ssap;

	__u8 dsap;

	__u8 ssap;

	__be16 ctrl;

	uint8_t  orig[3];

	__u8  orig[3];

	__be16 type;

};



struct ebt_802_3_hdr {

	uint8_t  daddr[6];

	uint8_t  saddr[6];

	__u8  daddr[6];

	__u8  saddr[6];

	__be16 len;

	union {

		struct hdr_ui ui;
@@ -59,10 +59,10 @@ static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb) 
#endif



struct ebt_802_3_info {

	uint8_t  sap;

	__u8  sap;

	__be16 type;

	uint8_t  bitmask;

	uint8_t  invflags;

	__u8  bitmask;

	__u8  invflags;

};



#endif

include/linux/netfilter_bridge/ebt_among.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
 */



struct ebt_mac_wormhash_tuple {

	uint32_t cmp[2];

	__u32 cmp[2];

	__be32 ip;

};

include/linux/netfilter_bridge/ebt_arp.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ struct ebt_arp_info 
	unsigned char smmsk[ETH_ALEN];

	unsigned char dmaddr[ETH_ALEN];

	unsigned char dmmsk[ETH_ALEN];

	uint8_t  bitmask;

	uint8_t  invflags;

	__u8  bitmask;

	__u8  invflags;

};



#endif

include/linux/netfilter_bridge/ebt_ip.h

+6 −6
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ struct ebt_ip_info { 
	__be32 daddr;

	__be32 smsk;

	__be32 dmsk;

	uint8_t  tos;

	uint8_t  protocol;

	uint8_t  bitmask;

	uint8_t  invflags;

	uint16_t sport[2];

	uint16_t dport[2];

	__u8  tos;

	__u8  protocol;

	__u8  bitmask;

	__u8  invflags;

	__u16 sport[2];

	__u16 dport[2];

};



#endif