aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c59x.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:54 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:50 -0400
commit27a1de95a1461ec0589005c293d6ac23a46cb72d (patch)
tree167e0c9aa3f2b179f4a38a7df734739e0b9cda6d /drivers/net/3c59x.c
parentad096463f7ff809389454ea4219058a36564d55e (diff)
3com: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r--drivers/net/3c59x.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index beb040264dbd..7adff4d0960d 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -716,8 +716,10 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);
716static void mdio_write(struct net_device *vp, int phy_id, int location, int value); 716static void mdio_write(struct net_device *vp, int phy_id, int location, int value);
717static void vortex_timer(unsigned long arg); 717static void vortex_timer(unsigned long arg);
718static void rx_oom_timer(unsigned long arg); 718static void rx_oom_timer(unsigned long arg);
719static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev); 719static netdev_tx_t vortex_start_xmit(struct sk_buff *skb,
720static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev); 720 struct net_device *dev);
721static netdev_tx_t boomerang_start_xmit(struct sk_buff *skb,
722 struct net_device *dev);
721static int vortex_rx(struct net_device *dev); 723static int vortex_rx(struct net_device *dev);
722static int boomerang_rx(struct net_device *dev); 724static int boomerang_rx(struct net_device *dev);
723static irqreturn_t vortex_interrupt(int irq, void *dev_id); 725static irqreturn_t vortex_interrupt(int irq, void *dev_id);
@@ -2035,7 +2037,7 @@ vortex_error(struct net_device *dev, int status)
2035 } 2037 }
2036} 2038}
2037 2039
2038static int 2040static netdev_tx_t
2039vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) 2041vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
2040{ 2042{
2041 struct vortex_private *vp = netdev_priv(dev); 2043 struct vortex_private *vp = netdev_priv(dev);
@@ -2090,7 +2092,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
2090 return NETDEV_TX_OK; 2092 return NETDEV_TX_OK;
2091} 2093}
2092 2094
2093static int 2095static netdev_tx_t
2094boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) 2096boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
2095{ 2097{
2096 struct vortex_private *vp = netdev_priv(dev); 2098 struct vortex_private *vp = netdev_priv(dev);