aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-15 20:51:57 -0400
committerEric W. Biederman <ebiederm@xmission.com>2014-03-25 00:19:07 -0400
commit6956d73aaf28d1449bc1222a0b2e997273cbf520 (patch)
treec7bed0fc8877b0e3991bd252982ccce7e29242a9 /drivers/net/ethernet/neterion
parente6d26bd00c0d68cee39bf36aae4db53d33ea05a0 (diff)
vxge: Call dev_kfree_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_kfree_skb_any in vxge_xmit that can be called in hard irq and other contexts. vxge_xmit only calls dev_kfree_skb_any when errors result in dropping skbs. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/neterion')
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 11adc89959c1..d107bcbb8543 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -824,7 +824,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
824 if (unlikely(skb->len <= 0)) { 824 if (unlikely(skb->len <= 0)) {
825 vxge_debug_tx(VXGE_ERR, 825 vxge_debug_tx(VXGE_ERR,
826 "%s: Buffer has no data..", dev->name); 826 "%s: Buffer has no data..", dev->name);
827 dev_kfree_skb(skb); 827 dev_kfree_skb_any(skb);
828 return NETDEV_TX_OK; 828 return NETDEV_TX_OK;
829 } 829 }
830 830
@@ -833,7 +833,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
833 if (unlikely(!is_vxge_card_up(vdev))) { 833 if (unlikely(!is_vxge_card_up(vdev))) {
834 vxge_debug_tx(VXGE_ERR, 834 vxge_debug_tx(VXGE_ERR,
835 "%s: vdev not initialized", dev->name); 835 "%s: vdev not initialized", dev->name);
836 dev_kfree_skb(skb); 836 dev_kfree_skb_any(skb);
837 return NETDEV_TX_OK; 837 return NETDEV_TX_OK;
838 } 838 }
839 839
@@ -843,7 +843,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
843 vxge_debug_tx(VXGE_ERR, 843 vxge_debug_tx(VXGE_ERR,
844 "%s: Failed to store the mac address", 844 "%s: Failed to store the mac address",
845 dev->name); 845 dev->name);
846 dev_kfree_skb(skb); 846 dev_kfree_skb_any(skb);
847 return NETDEV_TX_OK; 847 return NETDEV_TX_OK;
848 } 848 }
849 } 849 }
@@ -990,7 +990,7 @@ _exit1:
990 vxge_hw_fifo_txdl_free(fifo_hw, dtr); 990 vxge_hw_fifo_txdl_free(fifo_hw, dtr);
991_exit0: 991_exit0:
992 netif_tx_stop_queue(fifo->txq); 992 netif_tx_stop_queue(fifo->txq);
993 dev_kfree_skb(skb); 993 dev_kfree_skb_any(skb);
994 994
995 return NETDEV_TX_OK; 995 return NETDEV_TX_OK;
996} 996}