diff options
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 7 |
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, | |||
628 | static void rtl8139_start_thread(struct rtl8139_private *tp); | 628 | static void rtl8139_start_thread(struct rtl8139_private *tp); |
629 | static void rtl8139_tx_timeout (struct net_device *dev); | 629 | static void rtl8139_tx_timeout (struct net_device *dev); |
630 | static void rtl8139_init_ring (struct net_device *dev); | 630 | static void rtl8139_init_ring (struct net_device *dev); |
631 | static int rtl8139_start_xmit (struct sk_buff *skb, | 631 | static 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 |
634 | static void rtl8139_poll_controller(struct net_device *dev); | 634 | static 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 | ||
1690 | static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev) | 1690 | static 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; |