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/nmclan_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/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index dd6059076705..5ed6339c52bc 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -424,7 +424,8 @@ static void nmclan_reset(struct net_device *dev); | |||
424 | static int mace_config(struct net_device *dev, struct ifmap *map); | 424 | static int mace_config(struct net_device *dev, struct ifmap *map); |
425 | static int mace_open(struct net_device *dev); | 425 | static int mace_open(struct net_device *dev); |
426 | static int mace_close(struct net_device *dev); | 426 | static int mace_close(struct net_device *dev); |
427 | static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev); | 427 | static netdev_tx_t mace_start_xmit(struct sk_buff *skb, |
428 | struct net_device *dev); | ||
428 | static void mace_tx_timeout(struct net_device *dev); | 429 | static void mace_tx_timeout(struct net_device *dev); |
429 | static irqreturn_t mace_interrupt(int irq, void *dev_id); | 430 | static irqreturn_t mace_interrupt(int irq, void *dev_id); |
430 | static struct net_device_stats *mace_get_stats(struct net_device *dev); | 431 | static struct net_device_stats *mace_get_stats(struct net_device *dev); |
@@ -937,7 +938,8 @@ static void mace_tx_timeout(struct net_device *dev) | |||
937 | netif_wake_queue(dev); | 938 | netif_wake_queue(dev); |
938 | } | 939 | } |
939 | 940 | ||
940 | static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) | 941 | static netdev_tx_t mace_start_xmit(struct sk_buff *skb, |
942 | struct net_device *dev) | ||
941 | { | 943 | { |
942 | mace_private *lp = netdev_priv(dev); | 944 | mace_private *lp = netdev_priv(dev); |
943 | unsigned int ioaddr = dev->base_addr; | 945 | unsigned int ioaddr = dev->base_addr; |