diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:34 -0400 |
commit | dbf02fae406daf4d583a279743869c686024c341 (patch) | |
tree | 38e926bdd4b445d1b51f263b2f5c7d3d749e6e43 /drivers/net/pcmcia/3c574_cs.c | |
parent | 4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9 (diff) |
netdev: convert pcmcia drivers to netdev_tx_t
Update all the pcmcia network drivers for 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/pcmcia/3c574_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index a23aa8724042..382d26520acc 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -239,7 +239,8 @@ static void tc574_wait_for_completion(struct net_device *dev, int cmd); | |||
239 | static void tc574_reset(struct net_device *dev); | 239 | static void tc574_reset(struct net_device *dev); |
240 | static void media_check(unsigned long arg); | 240 | static void media_check(unsigned long arg); |
241 | static int el3_open(struct net_device *dev); | 241 | static int el3_open(struct net_device *dev); |
242 | static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev); | 242 | static netdev_tx_t el3_start_xmit(struct sk_buff *skb, |
243 | struct net_device *dev); | ||
243 | static irqreturn_t el3_interrupt(int irq, void *dev_id); | 244 | static irqreturn_t el3_interrupt(int irq, void *dev_id); |
244 | static void update_stats(struct net_device *dev); | 245 | static void update_stats(struct net_device *dev); |
245 | static struct net_device_stats *el3_get_stats(struct net_device *dev); | 246 | static struct net_device_stats *el3_get_stats(struct net_device *dev); |
@@ -778,7 +779,8 @@ static void pop_tx_status(struct net_device *dev) | |||
778 | } | 779 | } |
779 | } | 780 | } |
780 | 781 | ||
781 | static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | 782 | static netdev_tx_t el3_start_xmit(struct sk_buff *skb, |
783 | struct net_device *dev) | ||
782 | { | 784 | { |
783 | unsigned int ioaddr = dev->base_addr; | 785 | unsigned int ioaddr = dev->base_addr; |
784 | struct el3_private *lp = netdev_priv(dev); | 786 | struct el3_private *lp = netdev_priv(dev); |