aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-11 14:14:58 -0700
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:39 +0100
commitc029c5b78a5d6a3092392548da6a62edc134bfa4 (patch)
tree82b61d6fce30bbe3a6e9e592cec2cca7860a106d /drivers/net
parent3e2eb8946907b2d53eb906e13e01d273c6534f5c (diff)
downloadkernel_samsung_smdk4412-c029c5b78a5d6a3092392548da6a62edc134bfa4.zip
kernel_samsung_smdk4412-c029c5b78a5d6a3092392548da6a62edc134bfa4.tar.gz
kernel_samsung_smdk4412-c029c5b78a5d6a3092392548da6a62edc134bfa4.tar.bz2
8139cp: Call dev_kfree_skby_any instead of kfree_skb.
commit 508f81d517ed1f3f0197df63ea7ab5cd91b6f3b3 upstream. Replace kfree_skb with dev_kfree_skb_any in cp_start_xmit as it can be called in both hard irq and other contexts. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 4aa830f..ab5c276 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -886,7 +886,7 @@ out_unlock:
return NETDEV_TX_OK;
out_dma_error:
- kfree_skb(skb);
+ dev_kfree_skb_any(skb);
cp->dev->stats.tx_dropped++;
goto out_unlock;
}