diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:31 -0400 |
commit | 4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9 (patch) | |
tree | 2e6f994037a04de53e82e36a0eac255b6b2ec803 /drivers/char/synclinkmp.c | |
parent | d71a674922e7519edb477ecb585e7d29d69c7aa7 (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/synclinkmp.c')
-rw-r--r-- | drivers/char/synclinkmp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 8d4a2a8a0a70..2b18adc4ee19 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -1608,10 +1608,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, | |||
1608 | * | 1608 | * |
1609 | * skb socket buffer containing HDLC frame | 1609 | * skb socket buffer containing HDLC frame |
1610 | * dev pointer to network device structure | 1610 | * dev pointer to network device structure |
1611 | * | ||
1612 | * returns 0 if success, otherwise error code | ||
1613 | */ | 1611 | */ |
1614 | static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) | 1612 | static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb, |
1613 | struct net_device *dev) | ||
1615 | { | 1614 | { |
1616 | SLMP_INFO *info = dev_to_port(dev); | 1615 | SLMP_INFO *info = dev_to_port(dev); |
1617 | unsigned long flags; | 1616 | unsigned long flags; |
@@ -1642,7 +1641,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1642 | tx_start(info); | 1641 | tx_start(info); |
1643 | spin_unlock_irqrestore(&info->lock,flags); | 1642 | spin_unlock_irqrestore(&info->lock,flags); |
1644 | 1643 | ||
1645 | return 0; | 1644 | return NETDEV_TX_OK; |
1646 | } | 1645 | } |
1647 | 1646 | ||
1648 | /** | 1647 | /** |