aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:48 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:31 -0400
commit4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9 (patch)
tree2e6f994037a04de53e82e36a0eac255b6b2ec803 /drivers/char/pcmcia
parentd71a674922e7519edb477ecb585e7d29d69c7aa7 (diff)
hdlc: convert to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r--drivers/char/pcmcia/synclink_cs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 77b364889224..caf6e4d19469 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -4005,10 +4005,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
4005 * 4005 *
4006 * skb socket buffer containing HDLC frame 4006 * skb socket buffer containing HDLC frame
4007 * dev pointer to network device structure 4007 * dev pointer to network device structure
4008 *
4009 * returns 0 if success, otherwise error code
4010 */ 4008 */
4011static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 4009static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
4010 struct net_device *dev)
4012{ 4011{
4013 MGSLPC_INFO *info = dev_to_port(dev); 4012 MGSLPC_INFO *info = dev_to_port(dev);
4014 unsigned long flags; 4013 unsigned long flags;
@@ -4043,7 +4042,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
4043 } 4042 }
4044 spin_unlock_irqrestore(&info->lock,flags); 4043 spin_unlock_irqrestore(&info->lock,flags);
4045 4044
4046 return 0; 4045 return NETDEV_TX_OK;
4047} 4046}
4048 4047
4049/** 4048/**