diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 20:05:27 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-25 00:19:00 -0400 |
commit | 290a79dbf7b26677d1f4fef0b2a436910684b564 (patch) | |
tree | e51ee165e1a4dcef03f83852cc8e89bfc1e9c71a /drivers/net/ethernet/dec/tulip/uli526x.c | |
parent | 086dfb7fadde4400f1473e7e818abf833f0e06c4 (diff) |
uli526x: Call dev_kfree/consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_kfree_skb_any in uli562x_start_xmit
that can be called in hard irq and other contexts, when the packet is
dropped.
Replace dev_kfree_skb with dev_consume_skb_any in uli562x_start_xmit
that can be called in hard irq and other contexts, when the packet is
transmitted.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/dec/tulip/uli526x.c')
-rw-r--r-- | drivers/net/ethernet/dec/tulip/uli526x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index aa4ee385091f..aa801a6af7b9 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c | |||
@@ -607,7 +607,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb, | |||
607 | /* Too large packet check */ | 607 | /* Too large packet check */ |
608 | if (skb->len > MAX_PACKET_SIZE) { | 608 | if (skb->len > MAX_PACKET_SIZE) { |
609 | netdev_err(dev, "big packet = %d\n", (u16)skb->len); | 609 | netdev_err(dev, "big packet = %d\n", (u16)skb->len); |
610 | dev_kfree_skb(skb); | 610 | dev_kfree_skb_any(skb); |
611 | return NETDEV_TX_OK; | 611 | return NETDEV_TX_OK; |
612 | } | 612 | } |
613 | 613 | ||
@@ -648,7 +648,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb, | |||
648 | uw32(DCR7, db->cr7_data); | 648 | uw32(DCR7, db->cr7_data); |
649 | 649 | ||
650 | /* free this SKB */ | 650 | /* free this SKB */ |
651 | dev_kfree_skb(skb); | 651 | dev_consume_skb_any(skb); |
652 | 652 | ||
653 | return NETDEV_TX_OK; | 653 | return NETDEV_TX_OK; |
654 | } | 654 | } |