Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[IPV6]: ip6_output annotations 



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

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -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];

};

net/ipv6/ip6_output.c

+2 −2
Original line number Diff line number Diff line
@@ -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;