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

Commit 1ced98e8 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF] ipv6: More skb_reset_network_header conversions related to skb_pull 



Now related to this form:

skb->nh.ipv6h = (struct ipv6hdr *)skb_put(skb, length);

That, as the others, is done when skb->tail is still equal to skb->data, making
the conversion to skb_reset_network_header possible.

Also one more case equivalent to skb->nh.raw = skb->data, of this form:

iph = (struct ipv6hdr *)skb->data;
<SNIP>
skb->nh.ipv6h = iph;

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8856dfa3

net/ipv6/datagram.c

+3 −2
Original line number Diff line number Diff line
@@ -251,8 +251,9 @@ void ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info) 
	if (!skb)

		return;



	iph = (struct ipv6hdr*)skb_put(skb, sizeof(struct ipv6hdr));

	skb->nh.ipv6h = iph;

	skb_put(skb, sizeof(struct ipv6hdr));

	skb_reset_network_header(skb);

	iph = skb->nh.ipv6h;

	ipv6_addr_copy(&iph->daddr, &fl->fl6_dst);



	serr = SKB_EXT_ERR(skb);

net/ipv6/netfilter/ip6t_REJECT.c

+3 −2
Original line number Diff line number Diff line
@@ -120,8 +120,9 @@ static void send_reset(struct sk_buff *oldskb) 


	skb_reserve(nskb, hh_len + dst->header_len);



	ip6h = nskb->nh.ipv6h = (struct ipv6hdr *)

	skb_put(nskb, sizeof(struct ipv6hdr));

	skb_reset_network_header(nskb);

	ip6h = nskb->nh.ipv6h;

	ip6h->version = 6;

	ip6h->hop_limit = dst_metric(dst, RTAX_HOPLIMIT);

	ip6h->nexthdr = IPPROTO_TCP;

net/ipv6/raw.c

+3 −1
Original line number Diff line number Diff line
@@ -575,7 +575,9 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length, 
	skb->priority = sk->sk_priority;

	skb->dst = dst_clone(&rt->u.dst);



	skb->nh.ipv6h = iph = (struct ipv6hdr *)skb_put(skb, length);

	skb_put(skb, length);

	skb_reset_network_header(skb);

	iph = skb->nh.ipv6h;



	skb->ip_summed = CHECKSUM_NONE;

net/sctp/ipv6.c

+1 −2
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
			     int type, int code, int offset, __be32 info)

{

	struct inet6_dev *idev;

	struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;

	struct sctphdr *sh = (struct sctphdr *)(skb->data + offset);

	struct sock *sk;

	struct sctp_association *asoc;
@@ -136,7 +135,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	/* Fix up skb to look at the embedded net header. */

	saveip = skb->nh.raw;

	savesctp  = skb->h.raw;

	skb->nh.ipv6h = iph;

	skb_reset_network_header(skb);

	skb->h.raw = (char *)sh;

	sk = sctp_err_lookup(AF_INET6, skb, sh, &asoc, &transport);

	/* Put back, the original pointers. */