diff options
| author | Ingo Molnar | 2019-02-11 12:52:51 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2019-02-11 12:52:51 +0100 |
| commit | dc14b5fe7d0a1e37e9388964614676e4166b2953 (patch) | |
| tree | 4f4f3aed094446b3e5daedd8710ccd831943490f /drivers/net/ethernet/i825xx/82596.c | |
| parent | x86/fpu: Get rid of CONFIG_AS_FXSAVEQ (diff) | |
| parent | Linux 5.0-rc6 (diff) | |
| download | kernel-qcow2-linux-dc14b5fe7d0a1e37e9388964614676e4166b2953.tar.gz kernel-qcow2-linux-dc14b5fe7d0a1e37e9388964614676e4166b2953.tar.xz kernel-qcow2-linux-dc14b5fe7d0a1e37e9388964614676e4166b2953.zip | |
Merge tag 'v5.0-rc6' into x86/fpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/i825xx/82596.c')
| -rw-r--r-- | drivers/net/ethernet/i825xx/82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c index d719668a6684..92929750f832 100644 --- a/drivers/net/ethernet/i825xx/82596.c +++ b/drivers/net/ethernet/i825xx/82596.c @@ -1310,7 +1310,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id) dev->stats.tx_aborted_errors++; } - dev_kfree_skb_irq(skb); + dev_consume_skb_irq(skb); tx_cmd->cmd.command = 0; /* Mark free */ break; |