提交 ae08e1f0 编写于 作者: A Al Viro 提交者: David S. Miller

[IPV6]: ip6_output annotations

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 98a4a861
...@@ -139,7 +139,7 @@ struct skb_shared_info { ...@@ -139,7 +139,7 @@ struct skb_shared_info {
/* Warning: this field is not always filled in (UFO)! */ /* Warning: this field is not always filled in (UFO)! */
unsigned short gso_segs; unsigned short gso_segs;
unsigned short gso_type; unsigned short gso_type;
unsigned int ip6_frag_id; __be32 ip6_frag_id;
struct sk_buff *frag_list; struct sk_buff *frag_list;
skb_frag_t frags[MAX_SKB_FRAGS]; skb_frag_t frags[MAX_SKB_FRAGS];
}; };
......
...@@ -267,7 +267,7 @@ int ip6_nd_hdr(struct sock *sk, struct sk_buff *skb, struct net_device *dev, ...@@ -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)); hdr = (struct ipv6hdr *) skb_put(skb, sizeof(struct ipv6hdr));
skb->nh.ipv6h = hdr; skb->nh.ipv6h = hdr;
*(u32*)hdr = htonl(0x60000000); *(__be32*)hdr = htonl(0x60000000);
hdr->payload_len = htons(len); hdr->payload_len = htons(len);
hdr->nexthdr = proto; hdr->nexthdr = proto;
...@@ -571,7 +571,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) ...@@ -571,7 +571,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
struct ipv6hdr *tmp_hdr; struct ipv6hdr *tmp_hdr;
struct frag_hdr *fh; struct frag_hdr *fh;
unsigned int mtu, hlen, left, len; unsigned int mtu, hlen, left, len;
u32 frag_id = 0; __be32 frag_id = 0;
int ptr, offset = 0, err=0; int ptr, offset = 0, err=0;
u8 *prevhdr, nexthdr = 0; u8 *prevhdr, nexthdr = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册