aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 458daa06ed41..d4df9330c447 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4111,14 +4111,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
4111 if (unlikely(skb->len <= 0)) { 4111 if (unlikely(skb->len <= 0)) {
4112 DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name); 4112 DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name);
4113 dev_kfree_skb_any(skb); 4113 dev_kfree_skb_any(skb);
4114 return 0; 4114 return NETDEV_TX_OK;
4115 } 4115 }
4116 4116
4117 if (!is_s2io_card_up(sp)) { 4117 if (!is_s2io_card_up(sp)) {
4118 DBG_PRINT(TX_DBG, "%s: Card going down for reset\n", 4118 DBG_PRINT(TX_DBG, "%s: Card going down for reset\n",
4119 dev->name); 4119 dev->name);
4120 dev_kfree_skb(skb); 4120 dev_kfree_skb(skb);
4121 return 0; 4121 return NETDEV_TX_OK;
4122 } 4122 }
4123 4123
4124 queue = 0; 4124 queue = 0;
@@ -4192,7 +4192,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
4192 s2io_stop_tx_queue(sp, fifo->fifo_no); 4192 s2io_stop_tx_queue(sp, fifo->fifo_no);
4193 dev_kfree_skb(skb); 4193 dev_kfree_skb(skb);
4194 spin_unlock_irqrestore(&fifo->tx_lock, flags); 4194 spin_unlock_irqrestore(&fifo->tx_lock, flags);
4195 return 0; 4195 return NETDEV_TX_OK;
4196 } 4196 }
4197 4197
4198 offload_type = s2io_offload_type(skb); 4198 offload_type = s2io_offload_type(skb);
@@ -4304,14 +4304,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
4304 if (sp->config.intr_type == MSI_X) 4304 if (sp->config.intr_type == MSI_X)
4305 tx_intr_handler(fifo); 4305 tx_intr_handler(fifo);
4306 4306
4307 return 0; 4307 return NETDEV_TX_OK;
4308pci_map_failed: 4308pci_map_failed:
4309 stats->pci_map_fail_cnt++; 4309 stats->pci_map_fail_cnt++;
4310 s2io_stop_tx_queue(sp, fifo->fifo_no); 4310 s2io_stop_tx_queue(sp, fifo->fifo_no);
4311 stats->mem_freed += skb->truesize; 4311 stats->mem_freed += skb->truesize;
4312 dev_kfree_skb(skb); 4312 dev_kfree_skb(skb);
4313 spin_unlock_irqrestore(&fifo->tx_lock, flags); 4313 spin_unlock_irqrestore(&fifo->tx_lock, flags);
4314 return 0; 4314 return NETDEV_TX_OK;
4315} 4315}
4316 4316
4317static void 4317static void