aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8139too.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/8139too.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/8139too.c')
-rw-r--r--drivers/net/8139too.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index b39ec98345ea..4a3628755026 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -628,8 +628,8 @@ static void mdio_write (struct net_device *dev, int phy_id, int location,
628static void rtl8139_start_thread(struct rtl8139_private *tp); 628static void rtl8139_start_thread(struct rtl8139_private *tp);
629static void rtl8139_tx_timeout (struct net_device *dev); 629static void rtl8139_tx_timeout (struct net_device *dev);
630static void rtl8139_init_ring (struct net_device *dev); 630static void rtl8139_init_ring (struct net_device *dev);
631static int rtl8139_start_xmit (struct sk_buff *skb, 631static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,
632 struct net_device *dev); 632 struct net_device *dev);
633#ifdef CONFIG_NET_POLL_CONTROLLER 633#ifdef CONFIG_NET_POLL_CONTROLLER
634static void rtl8139_poll_controller(struct net_device *dev); 634static void rtl8139_poll_controller(struct net_device *dev);
635#endif 635#endif
@@ -1687,7 +1687,8 @@ static void rtl8139_tx_timeout (struct net_device *dev)
1687 } 1687 }
1688} 1688}
1689 1689
1690static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev) 1690static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,
1691 struct net_device *dev)
1691{ 1692{
1692 struct rtl8139_private *tp = netdev_priv(dev); 1693 struct rtl8139_private *tp = netdev_priv(dev);
1693 void __iomem *ioaddr = tp->mmio_addr; 1694 void __iomem *ioaddr = tp->mmio_addr;