diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 20:29:34 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-25 00:19:03 -0400 |
commit | 26faa9d777718380c56419861370c3fe06a78c15 (patch) | |
tree | b53d2f1640f9765b02e2fa41c085d0a56f874305 /drivers/net/ethernet/ibm | |
parent | cfbe40630745f2e9d4a51250e87a766c9a2907c2 (diff) |
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')
-rw-r--r-- | drivers/net/ethernet/ibm/ibmveth.c | 2 |
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: | |||
1044 | DMA_TO_DEVICE); | 1044 | DMA_TO_DEVICE); |
1045 | 1045 | ||
1046 | out: | 1046 | out: |
1047 | dev_kfree_skb(skb); | 1047 | dev_consume_skb_any(skb); |
1048 | return NETDEV_TX_OK; | 1048 | return NETDEV_TX_OK; |
1049 | 1049 | ||
1050 | map_failed_frags: | 1050 | map_failed_frags: |