[IPV6]: ip6_output 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/skbuff.h b/include/linux/skbuff.h
index 85577a4ffa618d5e319487ab396648a485c6223c..7fc9a3aaa1c947c317ac0f445bd589889a444b76 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -139,7 +139,7 @@ struct skb_shared_info {
        /* Warning: this field is not always filled in (UFO)! */
        unsigned short  gso_segs;
        unsigned short  gso_type;
-       unsigned int    ip6_frag_id;
+       __be32          ip6_frag_id;
        struct sk_buff  *frag_list;
        skb_frag_t      frags[MAX_SKB_FRAGS];
 };

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9ff1be1bc2e7b1d2d6b9fab786cec4bdd70db234..93330685adfc81e960e2443fbdd9906b08890baa 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -267,7 +267,7 @@ int ip6_nd_hdr(struct sock *sk, struct sk_buff *skb, struct net_device *dev,
        hdr = (struct ipv6hdr *) skb_put(skb, sizeof(struct ipv6hdr));
        skb->nh.ipv6h = hdr;
 
-       *(u32*)hdr = htonl(0x60000000);
+       *(__be32*)hdr = htonl(0x60000000);
 
        hdr->payload_len = htons(len);
        hdr->nexthdr = proto;
@@ -571,7 +571,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
        struct ipv6hdr *tmp_hdr;
        struct frag_hdr *fh;
        unsigned int mtu, hlen, left, len;
-       u32 frag_id = 0;
+       __be32 frag_id = 0;
        int ptr, offset = 0, err=0;
        u8 *prevhdr, nexthdr = 0;