diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 11:25:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 11:25:01 +0300 |
| commit | 3b6effbc3805a4fd282549d6283f115c47b12a7e (patch) | |
| tree | d7c7f818ffa5797c648ce3ea8b985b515e9ff816 /drivers/net/fddi | |
| parent | c2f4dd4364b71ef4eb43925b402377aefe9c1ca0 (diff) | |
| parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
| download | linux-3b6effbc3805a4fd282549d6283f115c47b12a7e.tar.xz | |
Merge 5.0-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/fddi')
| -rw-r--r-- | drivers/net/fddi/defxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 38ac8ef41f5f..56b7791911bf 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c @@ -3512,7 +3512,7 @@ static int dfx_xmt_done(DFX_board_t *bp) bp->descr_block_virt->xmt_data[comp].long_1, p_xmt_drv_descr->p_skb->len, DMA_TO_DEVICE); - dev_kfree_skb_irq(p_xmt_drv_descr->p_skb); + dev_consume_skb_irq(p_xmt_drv_descr->p_skb); /* * Move to start of next packet by updating completion index |