aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-23 02:03:08 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-05 22:16:04 -0400
commit6ed106549d17474ca17a16057f4c0ed4eba5a7ca (patch)
treeb98c09081509b3a9757339b6b66779e4126dfa29 /drivers/net/pcmcia
parent0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (diff)
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert all ndo_start_xmit() return values of 0 to NETDEV_TX_OK. Some occurences are missed by the automatic conversion, those will be handled in a seperate patch. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/3c574_cs.c2
-rw-r--r--drivers/net/pcmcia/3c589_cs.c2
-rw-r--r--drivers/net/pcmcia/axnet_cs.c2
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c4
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c2
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c6
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c4
7 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index f35c609ba020..a23aa8724042 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -806,7 +806,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
806 pop_tx_status(dev); 806 pop_tx_status(dev);
807 spin_unlock_irqrestore(&lp->window_lock, flags); 807 spin_unlock_irqrestore(&lp->window_lock, flags);
808 dev_kfree_skb(skb); 808 dev_kfree_skb(skb);
809 return 0; 809 return NETDEV_TX_OK;
810} 810}
811 811
812/* The EL3 interrupt handler. */ 812/* The EL3 interrupt handler. */
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index ec7cf5ac4f05..a77417c51e44 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -635,7 +635,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
635 spin_unlock_irqrestore(&priv->lock, flags); 635 spin_unlock_irqrestore(&priv->lock, flags);
636 dev_kfree_skb(skb); 636 dev_kfree_skb(skb);
637 637
638 return 0; 638 return NETDEV_TX_OK;
639} 639}
640 640
641/* The EL3 interrupt handler. */ 641/* The EL3 interrupt handler. */
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 0e38d80fd255..b5cfac7c5179 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1179,7 +1179,7 @@ static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
1179 dev_kfree_skb (skb); 1179 dev_kfree_skb (skb);
1180 dev->stats.tx_bytes += send_length; 1180 dev->stats.tx_bytes += send_length;
1181 1181
1182 return 0; 1182 return NETDEV_TX_OK;
1183} 1183}
1184 1184
1185/** 1185/**
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 479d5b494371..434d9407bfb3 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -865,7 +865,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)
865 if (length < ETH_ZLEN) 865 if (length < ETH_ZLEN)
866 { 866 {
867 if (skb_padto(skb, ETH_ZLEN)) 867 if (skb_padto(skb, ETH_ZLEN))
868 return 0; 868 return NETDEV_TX_OK;
869 length = ETH_ZLEN; 869 length = ETH_ZLEN;
870 } 870 }
871 871
@@ -924,7 +924,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)
924 } 924 }
925 dev_kfree_skb (skb); 925 dev_kfree_skb (skb);
926 926
927 return 0; 927 return NETDEV_TX_OK;
928} /* fjn_start_xmit */ 928} /* fjn_start_xmit */
929 929
930/*====================================================================*/ 930/*====================================================================*/
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 02ef63ed1f99..0f8118a82579 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -990,7 +990,7 @@ static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev)
990 990
991 dev_kfree_skb(skb); 991 dev_kfree_skb(skb);
992 992
993 return 0; 993 return NETDEV_TX_OK;
994} /* mace_start_xmit */ 994} /* mace_start_xmit */
995 995
996/* ---------------------------------------------------------------------------- 996/* ----------------------------------------------------------------------------
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 37e05d3ab893..2f39244c17f2 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1399,7 +1399,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
1399 dev_kfree_skb (skb); 1399 dev_kfree_skb (skb);
1400 smc->saved_skb = NULL; 1400 smc->saved_skb = NULL;
1401 dev->stats.tx_dropped++; 1401 dev->stats.tx_dropped++;
1402 return 0; /* Do not re-queue this packet. */ 1402 return NETDEV_TX_OK; /* Do not re-queue this packet. */
1403 } 1403 }
1404 /* A packet is now waiting. */ 1404 /* A packet is now waiting. */
1405 smc->packets_waiting++; 1405 smc->packets_waiting++;
@@ -1422,7 +1422,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
1422 outw((ir&0xff00) | IM_ALLOC_INT, ioaddr + INTERRUPT); 1422 outw((ir&0xff00) | IM_ALLOC_INT, ioaddr + INTERRUPT);
1423 smc_hardware_send_packet(dev); /* Send the packet now.. */ 1423 smc_hardware_send_packet(dev); /* Send the packet now.. */
1424 spin_unlock_irqrestore(&smc->lock, flags); 1424 spin_unlock_irqrestore(&smc->lock, flags);
1425 return 0; 1425 return NETDEV_TX_OK;
1426 } 1426 }
1427 } 1427 }
1428 1428
@@ -1431,7 +1431,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
1431 outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT); 1431 outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT);
1432 spin_unlock_irqrestore(&smc->lock, flags); 1432 spin_unlock_irqrestore(&smc->lock, flags);
1433 1433
1434 return 0; 1434 return NETDEV_TX_OK;
1435} 1435}
1436 1436
1437/*====================================================================== 1437/*======================================================================
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index ef37d22c7e1d..eda7bf6047cd 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1384,7 +1384,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)
1384 if (pktlen < ETH_ZLEN) 1384 if (pktlen < ETH_ZLEN)
1385 { 1385 {
1386 if (skb_padto(skb, ETH_ZLEN)) 1386 if (skb_padto(skb, ETH_ZLEN))
1387 return 0; 1387 return NETDEV_TX_OK;
1388 pktlen = ETH_ZLEN; 1388 pktlen = ETH_ZLEN;
1389 } 1389 }
1390 1390
@@ -1414,7 +1414,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)
1414 dev->trans_start = jiffies; 1414 dev->trans_start = jiffies;
1415 dev->stats.tx_bytes += pktlen; 1415 dev->stats.tx_bytes += pktlen;
1416 netif_start_queue(dev); 1416 netif_start_queue(dev);
1417 return 0; 1417 return NETDEV_TX_OK;
1418} 1418}
1419 1419
1420/**************** 1420/****************