Commit 47c183fa authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[BRIDGE]: Annotations. 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30d492da

include/linux/netfilter_bridge.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline int nf_bridge_pad(const struct sk_buff *skb) 


struct bridge_skb_cb {

	union {

		__u32 ipv4;

		__be32 ipv4;

	} daddr;

};

include/linux/netfilter_bridge/ebt_802_3.h

+5 −5
Original line number Diff line number Diff line
@@ -28,21 +28,21 @@ struct hdr_ui { 
	uint8_t ssap;

	uint8_t ctrl;

	uint8_t orig[3];

	uint16_t type;

	__be16 type;

};



struct hdr_ni {

	uint8_t dsap;

	uint8_t ssap;

	uint16_t ctrl;

	__be16 ctrl;

	uint8_t  orig[3];

	uint16_t type;

	__be16 type;

};



struct ebt_802_3_hdr {

	uint8_t  daddr[6];

	uint8_t  saddr[6];

	uint16_t len;

	__be16 len;

	union {

		struct hdr_ui ui;

		struct hdr_ni ni;
@@ -61,7 +61,7 @@ static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb) 
struct ebt_802_3_info 

{

	uint8_t  sap;

	uint16_t type;

	__be16 type;

	uint8_t  bitmask;

	uint8_t  invflags;

};

include/linux/netfilter_bridge/ebt_among.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
struct ebt_mac_wormhash_tuple

{

	uint32_t cmp[2];

	uint32_t ip;

	__be32 ip;

};



struct ebt_mac_wormhash

include/linux/netfilter_bridge/ebt_arp.h

+7 −7
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 


struct ebt_arp_info

{

	uint16_t htype;

	uint16_t ptype;

	uint16_t opcode;

	uint32_t saddr;

	uint32_t smsk;

	uint32_t daddr;

	uint32_t dmsk;

	__be16 htype;

	__be16 ptype;

	__be16 opcode;

	__be32 saddr;

	__be32 smsk;

	__be32 daddr;

	__be32 dmsk;

	unsigned char smaddr[ETH_ALEN];

	unsigned char smmsk[ETH_ALEN];

	unsigned char dmaddr[ETH_ALEN];

include/linux/netfilter_bridge/ebt_ip.h

+4 −4
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
/* the same values are used for the invflags */

struct ebt_ip_info

{

	uint32_t saddr;

	uint32_t daddr;

	uint32_t smsk;

	uint32_t dmsk;

	__be32 saddr;

	__be32 daddr;

	__be32 smsk;

	__be32 dmsk;

	uint8_t  tos;

	uint8_t  protocol;

	uint8_t  bitmask;