| commit | 0f672f6c0b52b7b0700b0915c72b540721af4465 | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Tue Dec 10 10:32:29 2019 +0000 |
| committer | David Brazdil <dbrazdil@google.com> | Tue Dec 10 19:03:18 2019 +0000 |
| tree | 85c8cba019caa205e4f8920d72d93f6d6deaf29c | |
| parent | 3a0ad55d848b50499b68d7141d4eca997fce28ef [diff] |
Update Linux to v5.4.2 Change-Id: Idf6911045d9d382da2cfe01b1edff026404ac8fd
diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig index 822cffb..86e02da 100644 --- a/drivers/net/ethernet/adaptec/Kconfig +++ b/drivers/net/ethernet/adaptec/Kconfig
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Adaptec network device configuration #
diff --git a/drivers/net/ethernet/adaptec/Makefile b/drivers/net/ethernet/adaptec/Makefile index 6c07b75..d84138c 100644 --- a/drivers/net/ethernet/adaptec/Makefile +++ b/drivers/net/ethernet/adaptec/Makefile
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for the Adaptec network device drivers. #
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 097467f..816540e 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -1390,7 +1390,7 @@ } } - dev_kfree_skb_irq(skb); + dev_consume_skb_irq(skb); } np->tx_done_q[np->tx_done].status = 0; np->tx_done = (np->tx_done + 1) % DONE_Q_SIZE;