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/synclink_gt.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/synclink_gt.c')
-rw-r--r-- | drivers/char/synclink_gt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index 91f20a92fddf..8678f0c8699d 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
@@ -1497,10 +1497,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, | |||
1497 | * | 1497 | * |
1498 | * skb socket buffer containing HDLC frame | 1498 | * skb socket buffer containing HDLC frame |
1499 | * dev pointer to network device structure | 1499 | * dev pointer to network device structure |
1500 | * | ||
1501 | * returns 0 if success, otherwise error code | ||
1502 | */ | 1500 | */ |
1503 | static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) | 1501 | static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb, |
1502 | struct net_device *dev) | ||
1504 | { | 1503 | { |
1505 | struct slgt_info *info = dev_to_port(dev); | 1504 | struct slgt_info *info = dev_to_port(dev); |
1506 | unsigned long flags; | 1505 | unsigned long flags; |
@@ -1529,7 +1528,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1529 | update_tx_timer(info); | 1528 | update_tx_timer(info); |
1530 | spin_unlock_irqrestore(&info->lock,flags); | 1529 | spin_unlock_irqrestore(&info->lock,flags); |
1531 | 1530 | ||
1532 | return 0; | 1531 | return NETDEV_TX_OK; |
1533 | } | 1532 | } |
1534 | 1533 | ||
1535 | /** | 1534 | /** |