aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sis900.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:58 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:14:07 -0400
commit61357325f377889a1daffa14962d705dc814dd0e (patch)
tree7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/sis900.c
parentd0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff)
netdev: convert bulk of drivers to netdev_tx_t
In a couple of cases collapse some extra code like: int retval = NETDEV_TX_OK; ... return retval; into return NETDEV_TX_OK; Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sis900.c')
-rw-r--r--drivers/net/sis900.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 61ceeaaf104d..d8827323507a 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -214,7 +214,8 @@ static void sis900_check_mode (struct net_device *net_dev, struct mii_phy *mii_p
214static void sis900_tx_timeout(struct net_device *net_dev); 214static void sis900_tx_timeout(struct net_device *net_dev);
215static void sis900_init_tx_ring(struct net_device *net_dev); 215static void sis900_init_tx_ring(struct net_device *net_dev);
216static void sis900_init_rx_ring(struct net_device *net_dev); 216static void sis900_init_rx_ring(struct net_device *net_dev);
217static int sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev); 217static netdev_tx_t sis900_start_xmit(struct sk_buff *skb,
218 struct net_device *net_dev);
218static int sis900_rx(struct net_device *net_dev); 219static int sis900_rx(struct net_device *net_dev);
219static void sis900_finish_xmit (struct net_device *net_dev); 220static void sis900_finish_xmit (struct net_device *net_dev);
220static irqreturn_t sis900_interrupt(int irq, void *dev_instance); 221static irqreturn_t sis900_interrupt(int irq, void *dev_instance);
@@ -1571,7 +1572,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)
1571 * tell upper layer if the buffer is full 1572 * tell upper layer if the buffer is full
1572 */ 1573 */
1573 1574
1574static int 1575static netdev_tx_t
1575sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) 1576sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
1576{ 1577{
1577 struct sis900_private *sis_priv = netdev_priv(net_dev); 1578 struct sis900_private *sis_priv = netdev_priv(net_dev);