[PATCH NET 5/7] vrf: use pskb_realloc_headroom in vrf_finish_output
From: Vasily Averin <hidden>
Date: 2021-07-12 13:27:19
Also in:
lkml
Subsystem:
networking drivers, the rest, vrf · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, David Ahern
Unlike skb_realloc_headroom, new helper pskb_realloc_headroom does not allocate a new skb if possible. Signed-off-by: Vasily Averin <redacted> --- drivers/net/vrf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 28a6c4c..74b9538 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c@@ -863,18 +863,12 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s /* Be paranoid, rather than too clever. */ if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) { - struct sk_buff *skb2; + skb = pskb_realloc_headroom(skb, hh_len); - skb2 = skb_realloc_headroom(skb, LL_RESERVED_SPACE(dev)); - if (!skb2) { - ret = -ENOMEM; - goto err; + if (!skb) { + dev->stats.tx_errors++; + return -ENOMEM; } - if (skb->sk) - skb_set_owner_w(skb2, skb->sk); - - consume_skb(skb); - skb = skb2; } rcu_read_lock_bh();
--
1.8.3.1