[BRIDGE]: Annotations.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index 9a4dd11af86ec2b1f5c1f75b7906522518fe6b66..6c4613f8ad75ec6343d3e3178a7d43c224f8d02d 100644 (file)
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -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;
 };
 

diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h
index b9f712c14a0af4b88591773544b82c90f7f2706f..07f044ff1a6b41ae46e0abde048e26e85a7a8648 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
@@ -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;
 };

diff --git a/include/linux/netfilter_bridge/ebt_among.h b/include/linux/netfilter_bridge/ebt_among.h
index 307c1fed8511e202872056bd8448ff8cacca2ce7..7654069233ca36f45ae693d6e61f008d3d15f4b5 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/linux/netfilter_bridge/ebt_among.h
@@ -32,7 +32,7 @@
 struct ebt_mac_wormhash_tuple
 {
        uint32_t cmp[2];
-       uint32_t ip;
+       __be32 ip;
 };
 
 struct ebt_mac_wormhash

diff --git a/include/linux/netfilter_bridge/ebt_arp.h b/include/linux/netfilter_bridge/ebt_arp.h
index 537ec6b487a2ce1f39cdbb8fc9ce9b089309d6d2..97e4dbde1f89958e5ce218411c6264bc713af6da 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_arp.h
+++ b/include/linux/netfilter_bridge/ebt_arp.h
@@ -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];

diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/linux/netfilter_bridge/ebt_ip.h
index 7247385cdcb1f2d087d5c1e38e09d3508f8cb296..d6847475bf2e2cd57ae9fc30cdfcedaab11dd332 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_ip.h
+++ b/include/linux/netfilter_bridge/ebt_ip.h
@@ -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;

diff --git a/include/linux/netfilter_bridge/ebt_vlan.h b/include/linux/netfilter_bridge/ebt_vlan.h
index cb1fcc41565f284385228d76013746a2da23732d..1d98be4031e720d6fdc4c74ab9f997047872c6b9 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_vlan.h
+++ b/include/linux/netfilter_bridge/ebt_vlan.h
@@ -10,7 +10,7 @@
 struct ebt_vlan_info {
        uint16_t id;            /* VLAN ID {1-4095} */
        uint8_t prio;           /* VLAN User Priority {0-7} */
-       uint16_t encap;         /* VLAN Encapsulated frame code {0-65535} */
+       __be16 encap;           /* VLAN Encapsulated frame code {0-65535} */
        uint8_t bitmask;                /* Args bitmask bit 1=1 - ID arg,
                                   bit 2=1 User-Priority arg, bit 3=1 encap*/
        uint8_t invflags;               /* Inverse bitmask  bit 1=1 - inversed ID arg, 

diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index b1a7cc90877b12eeb14230d046de8694192a8624..e6ea70de24d59649cfd89a301a80624f13d65ebf 100644 (file)
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -141,7 +141,7 @@ struct ebt_entry {
        /* this needs to be the first field */
        unsigned int bitmask;
        unsigned int invflags;
-       uint16_t ethproto;
+       __be16 ethproto;
        /* the physical in-dev */
        char in[IFNAMSIZ];
        /* the logical in-dev */

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index ac181be13d83e1e7fb053e8307808a46f9693964..2a5d31b1a1964f14e885cd1a6cee05ff84232df5 100644 (file)
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -381,7 +381,7 @@ static int check_hbh_len(struct sk_buff *skb)
                case IPV6_TLV_JUMBO:
                        if (skb->nh.raw[off + 1] != 4 || (off & 3) != 2)
                                goto bad;
-                       pkt_len = ntohl(*(u32 *) (skb->nh.raw + off + 2));
+                       pkt_len = ntohl(*(__be32 *) (skb->nh.raw + off + 2));
                        if (pkt_len <= IPV6_MAXPLEN ||
                            skb->nh.ipv6h->payload_len)
                                goto bad;

diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c
index d42f63f5e9f8cfdc738223dcc47c68fbb2b34a38..9abbc09ccdc376348545791de814ac835bb3194d 100644 (file)
--- a/net/bridge/netfilter/ebt_802_3.c
+++ b/net/bridge/netfilter/ebt_802_3.c
@@ -17,7 +17,7 @@ static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *
 {
        struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;
        struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);
-       uint16_t type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
+       __be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
 
        if (info->bitmask & EBT_802_3_SAP) {
                if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP)) 

diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c
index a614485828af31e78559d6bb610439b4f3353296..ce97c4285f9adc1ddcd9de259e05f99b9b48d292 100644 (file)
--- a/net/bridge/netfilter/ebt_among.c
+++ b/net/bridge/netfilter/ebt_among.c
@@ -15,7 +15,7 @@
 #include <linux/module.h>
 
 static int ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh,
-                                    const char *mac, uint32_t ip)
+                                    const char *mac, __be32 ip)
 {
        /* You may be puzzled as to how this code works.
         * Some tricks were used, refer to 
@@ -70,7 +70,7 @@ static int ebt_mac_wormhash_check_integrity(const struct ebt_mac_wormhash
        return 0;
 }
 
-static int get_ip_dst(const struct sk_buff *skb, uint32_t *addr)
+static int get_ip_dst(const struct sk_buff *skb, __be32 *addr)
 {
        if (eth_hdr(skb)->h_proto == htons(ETH_P_IP)) {
                struct iphdr _iph, *ih;
@@ -81,16 +81,16 @@ static int get_ip_dst(const struct sk_buff *skb, uint32_t *addr)
                *addr = ih->daddr;
        } else if (eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) {
                struct arphdr _arph, *ah;
-               uint32_t buf, *bp;
+               __be32 buf, *bp;
 
                ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);
                if (ah == NULL ||
-                   ah->ar_pln != sizeof(uint32_t) ||
+                   ah->ar_pln != sizeof(__be32) ||
                    ah->ar_hln != ETH_ALEN)
                        return -1;
                bp = skb_header_pointer(skb, sizeof(struct arphdr) +
-                                       2 * ETH_ALEN + sizeof(uint32_t),
-                                       sizeof(uint32_t), &buf);
+                                       2 * ETH_ALEN + sizeof(__be32),
+                                       sizeof(__be32), &buf);
                if (bp == NULL)
                        return -1;
                *addr = *bp;
@@ -98,7 +98,7 @@ static int get_ip_dst(const struct sk_buff *skb, uint32_t *addr)
        return 0;
 }
 
-static int get_ip_src(const struct sk_buff *skb, uint32_t *addr)
+static int get_ip_src(const struct sk_buff *skb, __be32 *addr)
 {
        if (eth_hdr(skb)->h_proto == htons(ETH_P_IP)) {
                struct iphdr _iph, *ih;
@@ -109,15 +109,15 @@ static int get_ip_src(const struct sk_buff *skb, uint32_t *addr)
                *addr = ih->saddr;
        } else if (eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) {
                struct arphdr _arph, *ah;
-               uint32_t buf, *bp;
+               __be32 buf, *bp;
 
                ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);
                if (ah == NULL ||
-                   ah->ar_pln != sizeof(uint32_t) ||
+                   ah->ar_pln != sizeof(__be32) ||
                    ah->ar_hln != ETH_ALEN)
                        return -1;
                bp = skb_header_pointer(skb, sizeof(struct arphdr) +
-                                       ETH_ALEN, sizeof(uint32_t), &buf);
+                                       ETH_ALEN, sizeof(__be32), &buf);
                if (bp == NULL)
                        return -1;
                *addr = *bp;
@@ -133,7 +133,7 @@ static int ebt_filter_among(const struct sk_buff *skb,
        struct ebt_among_info *info = (struct ebt_among_info *) data;
        const char *dmac, *smac;
        const struct ebt_mac_wormhash *wh_dst, *wh_src;
-       uint32_t dip = 0, sip = 0;
+       __be32 dip = 0, sip = 0;
 
        wh_dst = ebt_among_wh_dst(info);
        wh_src = ebt_among_wh_src(info);

diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c
index a6c81d9f73b85c07445d0e2e5ceb96a43f3ad88f..9c599800a90005b2a4602d6782daf86fb7b576ce 100644 (file)
--- a/net/bridge/netfilter/ebt_arp.c
+++ b/net/bridge/netfilter/ebt_arp.c
@@ -35,10 +35,10 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in
                return EBT_NOMATCH;
 
        if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP)) {
-               uint32_t _addr, *ap;
+               __be32 _addr, *ap;
 
                /* IPv4 addresses are always 4 bytes */
-               if (ah->ar_pln != sizeof(uint32_t))
+               if (ah->ar_pln != sizeof(__be32))
                        return EBT_NOMATCH;
                if (info->bitmask & EBT_ARP_SRC_IP) {
                        ap = skb_header_pointer(skb, sizeof(struct arphdr) +
@@ -53,7 +53,7 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in
 
                if (info->bitmask & EBT_ARP_DST_IP) {
                        ap = skb_header_pointer(skb, sizeof(struct arphdr) +
-                                               2*ah->ar_hln+sizeof(uint32_t),
+                                               2*ah->ar_hln+sizeof(__be32),
                                                sizeof(_addr), &_addr);
                        if (ap == NULL)
                                return EBT_NOMATCH;

diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
index 65b665ce57b5f3b2da41627f674142eb9c3ac8d8..e4c642448e1b41e403d0bab85b98c59b85b46d29 100644 (file)
--- a/net/bridge/netfilter/ebt_ip.c
+++ b/net/bridge/netfilter/ebt_ip.c
@@ -20,8 +20,8 @@
 #include <linux/module.h>
 
 struct tcpudphdr {
-       uint16_t src;
-       uint16_t dst;
+       __be16 src;
+       __be16 dst;
 };
 
 static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in,

diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 466ed3440b7446b3c6d976963b3056eb7f6dc9f5..a184f879f25396ea0b1dd079fd8a4d1de641a01d 100644 (file)
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -38,8 +38,8 @@ static int ebt_log_check(const char *tablename, unsigned int hookmask,
 
 struct tcpudphdr
 {
-       uint16_t src;
-       uint16_t dst;
+       __be16 src;
+       __be16 dst;
 };
 
 struct arppayload
@@ -130,7 +130,7 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum,
                 * then log the ARP payload */
                if (ah->ar_hrd == htons(1) &&
                    ah->ar_hln == ETH_ALEN &&
-                   ah->ar_pln == sizeof(uint32_t)) {
+                   ah->ar_pln == sizeof(__be32)) {
                        struct arppayload _arpp, *ap;
 
                        ap = skb_header_pointer(skb, sizeof(_arph),

diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c
index a2b452862b73d5cb42d652644f2cac1017bb68d9..7ee377622964d46e1bb57687c6af01587fe37fa3 100644 (file)
--- a/net/bridge/netfilter/ebt_vlan.c
+++ b/net/bridge/netfilter/ebt_vlan.c
@@ -55,7 +55,7 @@ ebt_filter_vlan(const struct sk_buff *skb,
        unsigned short id;      /* VLAN ID, given from frame TCI */
        unsigned char prio;     /* user_priority, given from frame TCI */
        /* VLAN encapsulated Type/Length field, given from orig frame */
-       unsigned short encap;
+       __be16 encap;
 
        fp = skb_header_pointer(skb, 0, sizeof(_frame), &_frame);
        if (fp == NULL)