aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c515.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/3c515.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/3c515.c')
-rw-r--r--drivers/net/3c515.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 3116410b3499..4adcb950f5f1 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -369,8 +369,8 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
369 struct pnp_dev *idev, int card_number); 369 struct pnp_dev *idev, int card_number);
370static int corkscrew_open(struct net_device *dev); 370static int corkscrew_open(struct net_device *dev);
371static void corkscrew_timer(unsigned long arg); 371static void corkscrew_timer(unsigned long arg);
372static int corkscrew_start_xmit(struct sk_buff *skb, 372static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
373 struct net_device *dev); 373 struct net_device *dev);
374static int corkscrew_rx(struct net_device *dev); 374static int corkscrew_rx(struct net_device *dev);
375static void corkscrew_timeout(struct net_device *dev); 375static void corkscrew_timeout(struct net_device *dev);
376static int boomerang_rx(struct net_device *dev); 376static int boomerang_rx(struct net_device *dev);
@@ -998,8 +998,8 @@ static void corkscrew_timeout(struct net_device *dev)
998 netif_wake_queue(dev); 998 netif_wake_queue(dev);
999} 999}
1000 1000
1001static int corkscrew_start_xmit(struct sk_buff *skb, 1001static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
1002 struct net_device *dev) 1002 struct net_device *dev)
1003{ 1003{
1004 struct corkscrew_private *vp = netdev_priv(dev); 1004 struct corkscrew_private *vp = netdev_priv(dev);
1005 int ioaddr = dev->base_addr; 1005 int ioaddr = dev->base_addr;