tokenring: convert to netdev_tx_t

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 07f6dfd3ba0c..a7b6888829b5 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -144,8 +144,8 @@ static void 	tms380tr_exec_sifcmd(struct net_device *dev, unsigned int WriteValu
 /* "G" */
 static struct net_device_stats *tms380tr_get_stats(struct net_device *dev);
 /* "H" */
-static int      tms380tr_hardware_send_packet(struct sk_buff *skb,
-                        struct net_device *dev);
+static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb,
+                                                       struct net_device *dev);
 /* "I" */
 static int      tms380tr_init_adapter(struct net_device *dev);
 static void     tms380tr_init_ipb(struct net_local *tp);
@@ -165,7 +165,8 @@ static int 	tms380tr_reset_adapter(struct net_device *dev);
 static void     tms380tr_reset_interrupt(struct net_device *dev);
 static void     tms380tr_ring_status_irq(struct net_device *dev);
 /* "S" */
-static int      tms380tr_send_packet(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t tms380tr_send_packet(struct sk_buff *skb,
+                                              struct net_device *dev);
 static void     tms380tr_set_multicast_list(struct net_device *dev);
 static int      tms380tr_set_mac_address(struct net_device *dev, void *addr);
 /* "T" */
@@ -599,21 +600,23 @@ static void tms380tr_timeout(struct net_device *dev)
 /*
  * Gets skb from system, queues it and checks if it can be sent
  */
-static int tms380tr_send_packet(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t tms380tr_send_packet(struct sk_buff *skb,
+                                              struct net_device *dev)
 {
         struct net_local *tp = netdev_priv(dev);
-        int err;
+        netdev_tx_t rc;
 
-        err = tms380tr_hardware_send_packet(skb, dev);
+        rc = tms380tr_hardware_send_packet(skb, dev);
         if(tp->TplFree->NextTPLPtr->BusyFlag)
                 netif_stop_queue(dev);
-        return (err);
+        return rc;
 }
 
 /*
  * Move frames into adapter tx queue
  */
-static int tms380tr_hardware_send_packet(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb,
+                                                       struct net_device *dev)
 {
         TPL *tpl;
         short length;