Commit 5678a595 authored by Vasily Averin's avatar Vasily Averin Committed by David S. Miller
Browse files

ipv4: use skb_expand_head in ip_finish_output2 



Unlike skb_realloc_headroom, new helper skb_expand_head
does not allocate a new skb if possible.

Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c9f227b

net/ipv4/ip_output.c

+2 −11
Original line number Diff line number Diff line
@@ -198,20 +198,11 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s 
	} else if (rt->rt_type == RTN_BROADCAST)

		IP_UPD_PO_STATS(net, IPSTATS_MIB_OUTBCAST, skb->len);



	/* Be paranoid, rather than too clever. */

	if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {

		struct sk_buff *skb2;



		skb2 = skb_realloc_headroom(skb, LL_RESERVED_SPACE(dev));

		if (!skb2) {

			kfree_skb(skb);

		skb = skb_expand_head(skb, hh_len);

		if (!skb)

			return -ENOMEM;

	}

		if (skb->sk)

			skb_set_owner_w(skb2, skb->sk);

		consume_skb(skb);

		skb = skb2;

	}



	if (lwtunnel_xmit_redirect(dst->lwtstate)) {

		int res = lwtunnel_xmit(skb);