aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/fmvj18x_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/fmvj18x_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/fmvj18x_cs.c')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 434d9407bfb3..7e01fbdb87e0 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -96,7 +96,8 @@ static void fmvj18x_detach(struct pcmcia_device *p_dev);
96static int fjn_config(struct net_device *dev, struct ifmap *map); 96static int fjn_config(struct net_device *dev, struct ifmap *map);
97static int fjn_open(struct net_device *dev); 97static int fjn_open(struct net_device *dev);
98static int fjn_close(struct net_device *dev); 98static int fjn_close(struct net_device *dev);
99static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev); 99static netdev_tx_t fjn_start_xmit(struct sk_buff *skb,
100 struct net_device *dev);
100static irqreturn_t fjn_interrupt(int irq, void *dev_id); 101static irqreturn_t fjn_interrupt(int irq, void *dev_id);
101static void fjn_rx(struct net_device *dev); 102static void fjn_rx(struct net_device *dev);
102static void fjn_reset(struct net_device *dev); 103static void fjn_reset(struct net_device *dev);
@@ -856,7 +857,8 @@ static void fjn_tx_timeout(struct net_device *dev)
856 netif_wake_queue(dev); 857 netif_wake_queue(dev);
857} 858}
858 859
859static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) 860static netdev_tx_t fjn_start_xmit(struct sk_buff *skb,
861 struct net_device *dev)
860{ 862{
861 struct local_info_t *lp = netdev_priv(dev); 863 struct local_info_t *lp = netdev_priv(dev);
862 unsigned int ioaddr = dev->base_addr; 864 unsigned int ioaddr = dev->base_addr;