diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 18:18:02 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-24 21:19:12 -0700 |
| commit | 66d1bee1f3d63be9d62dae5e0bb727155567c1ce (patch) | |
| tree | 12639da1a4bf9c81bcdec0b1c18ee305949dd38a | |
| parent | 241198acdacdb8545b68e344c42c0060b90c509a (diff) | |
| download | op-kernel-dev-66d1bee1f3d63be9d62dae5e0bb727155567c1ce.zip op-kernel-dev-66d1bee1f3d63be9d62dae5e0bb727155567c1ce.tar.gz | |
tilepro: Call dev_consume_skb_any instead of kfree_skb.
Replace kfree_skb with dev_consume_skb_any in tile_net_tx and
tile_net_tx_tso which can be called in hard irq and other contexts.
At the point where the skbs are freed a packet has been successfully
transmitted so dev_consume_skb_any is the appropriate variant to use.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
| -rw-r--r-- | drivers/net/ethernet/tile/tilepro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index b94449b..e5a5c5d 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c @@ -1824,7 +1824,7 @@ busy: /* Handle completions. */ for (i = 0; i < nolds; i++) - kfree_skb(olds[i]); + dev_consume_skb_any(olds[i]); /* Update stats. */ u64_stats_update_begin(&stats->syncp); @@ -2008,7 +2008,7 @@ busy: /* Handle completions. */ for (i = 0; i < nolds; i++) - kfree_skb(olds[i]); + dev_consume_skb_any(olds[i]); /* HACK: Track "expanded" size for short packets (e.g. 42 < 60). */ u64_stats_update_begin(&stats->syncp); |
