diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 19:50:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 01:13:34 -0700 |
| commit | dbf02fae406daf4d583a279743869c686024c341 (patch) | |
| tree | 38e926bdd4b445d1b51f263b2f5c7d3d749e6e43 /drivers/net/pcmcia/nmclan_cs.c | |
| parent | 4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9 (diff) | |
| download | kernel_samsung_crespo-dbf02fae406daf4d583a279743869c686024c341.zip kernel_samsung_crespo-dbf02fae406daf4d583a279743869c686024c341.tar.gz kernel_samsung_crespo-dbf02fae406daf4d583a279743869c686024c341.tar.bz2 | |
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 dd60590..5ed6339 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); static int mace_config(struct net_device *dev, struct ifmap *map); static int mace_open(struct net_device *dev); static int mace_close(struct net_device *dev); -static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t mace_start_xmit(struct sk_buff *skb, + struct net_device *dev); static void mace_tx_timeout(struct net_device *dev); static irqreturn_t mace_interrupt(int irq, void *dev_id); 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) netif_wake_queue(dev); } -static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t mace_start_xmit(struct sk_buff *skb, + struct net_device *dev) { mace_private *lp = netdev_priv(dev); unsigned int ioaddr = dev->base_addr; |