Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-04-26 22:39:08 -04:00
parent 78a57b482a f83246089c
commit b1513c3531
84 changed files with 616 additions and 248 deletions
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2451,6 +2451,9 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
 {
 	unsigned long flags;

+	if (unlikely(!skb))
+		return;
+
 	if (likely(atomic_read(&skb->users) == 1)) {
 		smp_rmb();
 		atomic_set(&skb->users, 0);