aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-11 17:19:50 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-12 16:22:13 -0400
commitd8ec2c02caa3515f35d6c33eedf529394c419298 (patch)
treead13374bac663861beec47d28e54bd16ba9d4a47
parente81f44b66b456a7dcfbdeffeb355458cd6a58973 (diff)
benet: Call dev_kfree_skby_any instead of kfree_skb.
Replace free_skb with dev_kfree_skb_any in be_tx_compl_process as which can be called in hard irq by netpoll, softirq context by normal napi polling, and in normal sleepable context by the network device close method. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 41736937e040..239273b7b881 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1919,7 +1919,7 @@ static u16 be_tx_compl_process(struct be_adapter *adapter,
1919 queue_tail_inc(txq); 1919 queue_tail_inc(txq);
1920 } while (cur_index != last_index); 1920 } while (cur_index != last_index);
1921 1921
1922 kfree_skb(sent_skb); 1922 dev_kfree_skb_any(sent_skb);
1923 return num_wrbs; 1923 return num_wrbs;
1924} 1924}
1925 1925