diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2015-09-18 01:19:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-21 07:23:40 +0200 |
| commit | fc27bd115b334e3ebdc682a42a47c3aea2566dcc (patch) | |
| tree | ec1f595dae620e48ba426fd78fd548f94c7b8feb /drivers | |
| parent | net: Fix behaviour of unreachable, blackhole and prohibit routes (diff) | |
| download | linux-fc27bd115b334e3ebdc682a42a47c3aea2566dcc.tar.xz linux-fc27bd115b334e3ebdc682a42a47c3aea2566dcc.zip | |
8139cp: Use dev_kfree_skb_any() instead of dev_kfree_skb() in cp_clean_rings()
This can be called from cp_tx_timeout() with interrupts disabled.
Spotted by Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/realtek/8139cp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index d79e33b3c191..52a533445f30 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -1151,7 +1151,7 @@ static void cp_clean_rings (struct cp_private *cp) desc = cp->rx_ring + i; dma_unmap_single(&cp->pdev->dev,le64_to_cpu(desc->addr), cp->rx_buf_sz, PCI_DMA_FROMDEVICE); - dev_kfree_skb(cp->rx_skb[i]); + dev_kfree_skb_any(cp->rx_skb[i]); } } @@ -1164,7 +1164,7 @@ static void cp_clean_rings (struct cp_private *cp) le32_to_cpu(desc->opts1) & 0xffff, PCI_DMA_TODEVICE); if (le32_to_cpu(desc->opts1) & LastFrag) - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); cp->dev->stats.tx_dropped++; } } |