summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-16 02:37:24 +0400
committerEric W. Biederman <ebiederm@xmission.com>2014-03-25 02:25:30 +0400
commit21534d20fe6f7108f7f4eaaf47f138e20e6c85c9 (patch)
tree8f0910cc855e2dba52c1228532a991f1a52a1d17
parente05b310198f2ff513ad6654176e0e263088f9500 (diff)
downloadlinux-21534d20fe6f7108f7f4eaaf47f138e20e6c85c9.tar.xz
bfin_mac: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in _tx_reclaim_skb that can be called in hard irq and other contexts. dev_consume_skb is used as _tx_reclaim_skb is called after a packet has been successfully transmitted. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--drivers/net/ethernet/adi/bfin_mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index 83a8cdbcd936..95779b6b7394 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1087,7 +1087,7 @@ static inline void _tx_reclaim_skb(void)
tx_list_head->desc_a.config &= ~DMAEN;
tx_list_head->status.status_word = 0;
if (tx_list_head->skb) {
- dev_kfree_skb(tx_list_head->skb);
+ dev_consume_skb_any(tx_list_head->skb);
tx_list_head->skb = NULL;
}
tx_list_head = tx_list_head->next;