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

Commit 0260c1dc authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: use __uXX guarded types for userspace exports 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 1cc34c30

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

include/linux/netfilter_bridge/ebt_ip6.h

+8 −8
Original line number Diff line number Diff line
@@ -31,17 +31,17 @@ struct ebt_ip6_info { 
	struct in6_addr daddr;

	struct in6_addr smsk;

	struct in6_addr dmsk;

	uint8_t  tclass;

	uint8_t  protocol;

	uint8_t  bitmask;

	uint8_t  invflags;

	__u8  tclass;

	__u8  protocol;

	__u8  bitmask;

	__u8  invflags;

	union {

		uint16_t sport[2];

		uint8_t icmpv6_type[2];

		__u16 sport[2];

		__u8 icmpv6_type[2];

	};

	union {

		uint16_t dport[2];

		uint8_t icmpv6_code[2];

		__u16 dport[2];

		__u8 icmpv6_code[2];

	};

};