diff options
| author | Vasily Averin <vvs@virtuozzo.com> | 2021-08-02 10:52:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-03 12:21:39 +0200 |
| commit | 5678a59579647c4d9affe5e6544baf7645b41e4f (patch) | |
| tree | 6aa79bd0421786188e922b6ee2d1fc909bca10b5 /net/ipv4/ip_output.c | |
| parent | ipv6: use skb_expand_head in ip6_xmit (diff) | |
| download | linux-5678a59579647c4d9affe5e6544baf7645b41e4f.tar.xz linux-5678a59579647c4d9affe5e6544baf7645b41e4f.zip | |
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: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_output.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index a202dcec0dc2..6b04a88466b2 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -198,19 +198,10 @@ 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)) { |