diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 20:20:57 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-25 00:19:02 -0400 |
commit | 374e29da7c2b86cfc4986a06f0923bdc861c2111 (patch) | |
tree | d0477210d044d814d59ba9a0bf1442d8e0aca7e0 /drivers/net/ethernet | |
parent | 361457415ae2028a27ee679f60be512efe40e083 (diff) |
i825xx: Call dev_kfree_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_kfree_skb_any in i596_start_xmit that
can be called in hard irq and other contexts, when the skb is dropped.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/i825xx/lib82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c index 17fca323c143..c984998b34a0 100644 --- a/drivers/net/ethernet/i825xx/lib82596.c +++ b/drivers/net/ethernet/i825xx/lib82596.c | |||
@@ -993,7 +993,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
993 | dev->name)); | 993 | dev->name)); |
994 | dev->stats.tx_dropped++; | 994 | dev->stats.tx_dropped++; |
995 | 995 | ||
996 | dev_kfree_skb(skb); | 996 | dev_kfree_skb_any(skb); |
997 | } else { | 997 | } else { |
998 | if (++lp->next_tx_cmd == TX_RING_SIZE) | 998 | if (++lp->next_tx_cmd == TX_RING_SIZE) |
999 | lp->next_tx_cmd = 0; | 999 | lp->next_tx_cmd = 0; |