summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm/ibmveth.c
diff options
context:
space:
mode:
authorEric W. Biederman2014-03-16 01:29:34 +0100
committerEric W. Biederman2014-03-25 05:19:03 +0100
commit26faa9d777718380c56419861370c3fe06a78c15 (patch)
treeb53d2f1640f9765b02e2fa41c085d0a56f874305 /drivers/net/ethernet/ibm/ibmveth.c
parentehea: Call dev_consume_skb_any instead of dev_kfree_skb. (diff)
downloadkernel-qcow2-linux-26faa9d777718380c56419861370c3fe06a78c15.tar.gz
kernel-qcow2-linux-26faa9d777718380c56419861370c3fe06a78c15.tar.xz
kernel-qcow2-linux-26faa9d777718380c56419861370c3fe06a78c15.zip
ibmveth: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in ibmveth_start_xmit that can be called in hard irq and other contexts. In this code path the packet can have either been transmitted or dropped, dev_consume_skb_any was choosen because that preserves the existing semantics of the code, and a transmitted packet is more likely. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmveth.c')
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index e75bdfcd1374..c9127562bd22 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1044,7 +1044,7 @@ retry_bounce:
DMA_TO_DEVICE);
out:
- dev_kfree_skb(skb);
+ dev_consume_skb_any(skb);
return NETDEV_TX_OK;
map_failed_frags: