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

2019-01-29 21:18:54 -08:00
parent c829f5f52d 6296789878
commit eaf2a47f40
78 changed files with 755 additions and 284 deletions
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -691,7 +691,7 @@ static void cp_tx (struct cp_private *cp)
 			}
 			bytes_compl += skb->len;
 			pkts_compl++;
-			dev_kfree_skb_irq(skb);
+			dev_consume_skb_irq(skb);
 		}

 		cp->tx_skb[tx_tail] = NULL;