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/xirc2ps_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/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index eda7bf6047cd..68de89167b49 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -352,7 +352,8 @@ typedef struct local_info_t { | |||
352 | /**************** | 352 | /**************** |
353 | * Some more prototypes | 353 | * Some more prototypes |
354 | */ | 354 | */ |
355 | static int do_start_xmit(struct sk_buff *skb, struct net_device *dev); | 355 | static netdev_tx_t do_start_xmit(struct sk_buff *skb, |
356 | struct net_device *dev); | ||
356 | static void xirc_tx_timeout(struct net_device *dev); | 357 | static void xirc_tx_timeout(struct net_device *dev); |
357 | static void xirc2ps_tx_timeout_task(struct work_struct *work); | 358 | static void xirc2ps_tx_timeout_task(struct work_struct *work); |
358 | static void set_addresses(struct net_device *dev); | 359 | static void set_addresses(struct net_device *dev); |
@@ -1361,7 +1362,7 @@ xirc_tx_timeout(struct net_device *dev) | |||
1361 | schedule_work(&lp->tx_timeout_task); | 1362 | schedule_work(&lp->tx_timeout_task); |
1362 | } | 1363 | } |
1363 | 1364 | ||
1364 | static int | 1365 | static netdev_tx_t |
1365 | do_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1366 | do_start_xmit(struct sk_buff *skb, struct net_device *dev) |
1366 | { | 1367 | { |
1367 | local_info_t *lp = netdev_priv(dev); | 1368 | local_info_t *lp = netdev_priv(dev); |