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/3c589_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/3c589_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index d2156ab3da2b..569fb06793cf 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -149,7 +149,8 @@ static void tc589_reset(struct net_device *dev); | |||
149 | static void media_check(unsigned long arg); | 149 | static void media_check(unsigned long arg); |
150 | static int el3_config(struct net_device *dev, struct ifmap *map); | 150 | static int el3_config(struct net_device *dev, struct ifmap *map); |
151 | static int el3_open(struct net_device *dev); | 151 | static int el3_open(struct net_device *dev); |
152 | static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev); | 152 | static netdev_tx_t el3_start_xmit(struct sk_buff *skb, |
153 | struct net_device *dev); | ||
153 | static irqreturn_t el3_interrupt(int irq, void *dev_id); | 154 | static irqreturn_t el3_interrupt(int irq, void *dev_id); |
154 | static void update_stats(struct net_device *dev); | 155 | static void update_stats(struct net_device *dev); |
155 | static struct net_device_stats *el3_get_stats(struct net_device *dev); | 156 | static struct net_device_stats *el3_get_stats(struct net_device *dev); |
@@ -604,7 +605,8 @@ static void pop_tx_status(struct net_device *dev) | |||
604 | } | 605 | } |
605 | } | 606 | } |
606 | 607 | ||
607 | static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | 608 | static netdev_tx_t el3_start_xmit(struct sk_buff *skb, |
609 | struct net_device *dev) | ||
608 | { | 610 | { |
609 | unsigned int ioaddr = dev->base_addr; | 611 | unsigned int ioaddr = dev->base_addr; |
610 | struct el3_private *priv = netdev_priv(dev); | 612 | struct el3_private *priv = netdev_priv(dev); |