diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 19:50:54 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 01:13:50 -0700 |
commit | 27a1de95a1461ec0589005c293d6ac23a46cb72d (patch) | |
tree | 167e0c9aa3f2b179f4a38a7df734739e0b9cda6d /drivers/net/3c59x.c | |
parent | ad096463f7ff809389454ea4219058a36564d55e (diff) | |
download | linux-3.10-27a1de95a1461ec0589005c293d6ac23a46cb72d.tar.gz linux-3.10-27a1de95a1461ec0589005c293d6ac23a46cb72d.tar.bz2 linux-3.10-27a1de95a1461ec0589005c293d6ac23a46cb72d.zip |
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.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index beb040264db..7adff4d0960 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); static void mdio_write(struct net_device *vp, int phy_id, int location, int value); static void vortex_timer(unsigned long arg); static void rx_oom_timer(unsigned long arg); -static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev); -static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t vortex_start_xmit(struct sk_buff *skb, + struct net_device *dev); +static netdev_tx_t boomerang_start_xmit(struct sk_buff *skb, + struct net_device *dev); static int vortex_rx(struct net_device *dev); static int boomerang_rx(struct net_device *dev); static irqreturn_t vortex_interrupt(int irq, void *dev_id); @@ -2035,7 +2037,7 @@ vortex_error(struct net_device *dev, int status) } } -static int +static netdev_tx_t vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct vortex_private *vp = netdev_priv(dev); @@ -2090,7 +2092,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } -static int +static netdev_tx_t boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct vortex_private *vp = netdev_priv(dev); |