diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-11 14:16:14 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:39 +0100 |
| commit | 35bc66c8c3053b090eef05e7e083f5de94b24128 (patch) | |
| tree | 65f186862a7bb00c82fbea7ef5fc6874b08c83f1 /drivers/net | |
| parent | 4325c781e9c874166b54a98c177b2676556b2dc9 (diff) | |
| download | kernel_samsung_smdk4412-35bc66c8c3053b090eef05e7e083f5de94b24128.zip kernel_samsung_smdk4412-35bc66c8c3053b090eef05e7e083f5de94b24128.tar.gz kernel_samsung_smdk4412-35bc66c8c3053b090eef05e7e083f5de94b24128.tar.bz2 | |
r8169: Call dev_kfree_skby_any instead of dev_kfree_skb.
commit 989c9ba104d9ce53c1ca918262f3fdfb33aca12a upstream.
Replace dev_kfree_skb with dev_kfree_skb_any in functions that can
be called in hard irq and other contexts.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index a3bd0ba..0c26787 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5372,7 +5372,7 @@ static void rtl8169_tx_clear_range(struct rtl8169_private *tp, u32 start, tp->TxDescArray + entry); if (skb) { tp->dev->stats.tx_dropped++; - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); tx_skb->skb = NULL; } } @@ -5651,7 +5651,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, err_dma_1: rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd); err_dma_0: - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); err_update_stats: dev->stats.tx_dropped++; return NETDEV_TX_OK; @@ -5734,7 +5734,7 @@ static void rtl8169_tx_interrupt(struct net_device *dev, if (status & LastFrag) { dev->stats.tx_packets++; dev->stats.tx_bytes += tx_skb->skb->len; - dev_kfree_skb(tx_skb->skb); + dev_kfree_skb_any(tx_skb->skb); tx_skb->skb = NULL; } dirty_tx++; |