Commit 7608894e authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

net: use skb_unref() in napi_consume_skb()

The commit 83ada39bb79d ("net: factor out a helper to decrement the
skb refcount") provided and used a helper for decrementing skb usage,
but I missed at least a spot for it.

This change remove some more duplicated code reusing skb_unref() in
napi_consume_skb(), too. The helper uses an additional, unneeded
unlikely(!skb) test - napi_consume_skb() already check it a few lines
above - but the compiler is smart enough to optimize the duplicated
test out.
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cbf87c7
...@@ -817,10 +817,9 @@ void napi_consume_skb(struct sk_buff *skb, int budget) ...@@ -817,10 +817,9 @@ void napi_consume_skb(struct sk_buff *skb, int budget)
return; return;
} }
if (likely(atomic_read(&skb->users) == 1)) if (!skb_unref(skb))
smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users)))
return; return;
/* if reaching here SKB is ready to free */ /* if reaching here SKB is ready to free */
trace_consume_skb(skb); trace_consume_skb(skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment