aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-08 03:27:11 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:21:26 -0500
commitae08e1f092210619fe49551aa3ed0dc0003d5880 (patch)
tree80e0ef51a052f811394b29bb19422feba80795bb /net
parent98a4a86128d7179b22365e16bf880e849e20bc7d (diff)
[IPV6]: ip6_output annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 9ff1be1bc2e7..93330685adfc 100644
--- 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,
267 hdr = (struct ipv6hdr *) skb_put(skb, sizeof(struct ipv6hdr)); 267 hdr = (struct ipv6hdr *) skb_put(skb, sizeof(struct ipv6hdr));
268 skb->nh.ipv6h = hdr; 268 skb->nh.ipv6h = hdr;
269 269
270 *(u32*)hdr = htonl(0x60000000); 270 *(__be32*)hdr = htonl(0x60000000);
271 271
272 hdr->payload_len = htons(len); 272 hdr->payload_len = htons(len);
273 hdr->nexthdr = proto; 273 hdr->nexthdr = proto;
@@ -571,7 +571,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
571 struct ipv6hdr *tmp_hdr; 571 struct ipv6hdr *tmp_hdr;
572 struct frag_hdr *fh; 572 struct frag_hdr *fh;
573 unsigned int mtu, hlen, left, len; 573 unsigned int mtu, hlen, left, len;
574 u32 frag_id = 0; 574 __be32 frag_id = 0;
575 int ptr, offset = 0, err=0; 575 int ptr, offset = 0, err=0;
576 u8 *prevhdr, nexthdr = 0; 576 u8 *prevhdr, nexthdr = 0;
577 577