aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/axnet_cs.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:49 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:34 -0400
commitdbf02fae406daf4d583a279743869c686024c341 (patch)
tree38e926bdd4b445d1b51f263b2f5c7d3d749e6e43 /drivers/net/pcmcia/axnet_cs.c
parent4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9 (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/axnet_cs.c')
-rw-r--r--drivers/net/pcmcia/axnet_cs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 1e87d634d7bc..3b681c1d7523 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -92,7 +92,8 @@ static void axnet_release(struct pcmcia_device *link);
92static int axnet_open(struct net_device *dev); 92static int axnet_open(struct net_device *dev);
93static int axnet_close(struct net_device *dev); 93static int axnet_close(struct net_device *dev);
94static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); 94static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
95static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev); 95static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,
96 struct net_device *dev);
96static struct net_device_stats *get_stats(struct net_device *dev); 97static struct net_device_stats *get_stats(struct net_device *dev);
97static void set_multicast_list(struct net_device *dev); 98static void set_multicast_list(struct net_device *dev);
98static void axnet_tx_timeout(struct net_device *dev); 99static void axnet_tx_timeout(struct net_device *dev);
@@ -1063,7 +1064,8 @@ static void axnet_tx_timeout(struct net_device *dev)
1063 * Sends a packet to an 8390 network device. 1064 * Sends a packet to an 8390 network device.
1064 */ 1065 */
1065 1066
1066static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev) 1067static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,
1068 struct net_device *dev)
1067{ 1069{
1068 long e8390_base = dev->base_addr; 1070 long e8390_base = dev->base_addr;
1069 struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); 1071 struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);