aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/synclink.c
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/synclink.c
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/synclink.c')
-rw-r--r--drivers/char/synclink.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 813552f14884..4846b73ef28d 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -7697,10 +7697,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
7697 * 7697 *
7698 * skb socket buffer containing HDLC frame 7698 * skb socket buffer containing HDLC frame
7699 * dev pointer to network device structure 7699 * dev pointer to network device structure
7700 *
7701 * returns 0 if success, otherwise error code
7702 */ 7700 */
7703static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 7701static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
7702 struct net_device *dev)
7704{ 7703{
7705 struct mgsl_struct *info = dev_to_port(dev); 7704 struct mgsl_struct *info = dev_to_port(dev);
7706 unsigned long flags; 7705 unsigned long flags;
@@ -7731,7 +7730,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
7731 usc_start_transmitter(info); 7730 usc_start_transmitter(info);
7732 spin_unlock_irqrestore(&info->irq_spinlock,flags); 7731 spin_unlock_irqrestore(&info->irq_spinlock,flags);
7733 7732
7734 return 0; 7733 return NETDEV_TX_OK;
7735} 7734}
7736 7735
7737/** 7736/**