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

[SK_BUFF]: Use skb_reset_network_header after skb_push 



Some more cases where skb->nh.iph was being set that were converted
to using skb_reset_network_header.

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

net/ipv4/ip_output.c

+6 −8
Original line number Diff line number Diff line
@@ -125,11 +125,9 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk, 
	struct iphdr *iph;



	/* Build the IP header. */

	if (opt)

		iph=(struct iphdr *)skb_push(skb,sizeof(struct iphdr) + opt->optlen);

	else

		iph=(struct iphdr *)skb_push(skb,sizeof(struct iphdr));



	skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));

	skb_reset_network_header(skb);

	iph = skb->nh.iph;

	iph->version  = 4;

	iph->ihl      = 5;

	iph->tos      = inet->tos;
@@ -143,7 +141,6 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk, 
	iph->protocol = sk->sk_protocol;

	iph->tot_len  = htons(skb->len);

	ip_select_ident(iph, &rt->u.dst, sk);

	skb->nh.iph   = iph;



	if (opt && opt->optlen) {

		iph->ihl += opt->optlen>>2;
@@ -333,7 +330,9 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok) 
		goto no_route;



	/* OK, we know where to send it, allocate and build IP header. */

	iph = (struct iphdr *) skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));

	skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));

	skb_reset_network_header(skb);

	iph = skb->nh.iph;

	*((__be16 *)iph) = htons((4 << 12) | (5 << 8) | (inet->tos & 0xff));

	iph->tot_len = htons(skb->len);

	if (ip_dont_fragment(sk, &rt->u.dst) && !ipfragok)
@@ -344,7 +343,6 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok) 
	iph->protocol = sk->sk_protocol;

	iph->saddr    = rt->rt_src;

	iph->daddr    = rt->rt_dst;

	skb->nh.iph   = iph;

	/* Transport layer set skb->h.foo itself. */



	if (opt && opt->optlen) {

net/ipv4/ipmr.c

+6 −3
Original line number Diff line number Diff line
@@ -1093,7 +1093,12 @@ static struct notifier_block ip_mr_notifier={ 


static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)

{

	struct iphdr *iph = (struct iphdr *)skb_push(skb,sizeof(struct iphdr));

	struct iphdr *iph;



	skb_push(skb, sizeof(struct iphdr));

	skb->h.ipiph = skb->nh.iph;

	skb_reset_network_header(skb);

	iph = skb->nh.iph;



	iph->version	= 	4;

	iph->tos	=	skb->nh.iph->tos;
@@ -1107,8 +1112,6 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr) 
	ip_select_ident(iph, skb->dst, NULL);

	ip_send_check(iph);



	skb->h.ipiph = skb->nh.iph;

	skb->nh.iph = iph;

	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));

	nf_reset(skb);

}