1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index f5c586c2bba6..1ad8785e398b 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -169,7 +169,8 @@ static int ether1394_header_cache(const struct neighbour *neigh,
 static void ether1394_header_cache_update(struct hh_cache *hh,
                                           const struct net_device *dev,
                                           const unsigned char *haddr);
-static int ether1394_tx(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t ether1394_tx(struct sk_buff *skb,
+                                struct net_device *dev);
 static void ether1394_iso(struct hpsb_iso *iso);
 
 static struct ethtool_ops ethtool_ops;
@@ -1555,7 +1556,8 @@ static void ether1394_complete_cb(void *__ptask)
 }
 
 /* Transmit a packet (called by kernel) */
-static int ether1394_tx(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ether1394_tx(struct sk_buff *skb,
+                                struct net_device *dev)
 {
         struct eth1394hdr hdr_buf;
         struct eth1394_priv *priv = netdev_priv(dev);
@@ -1694,14 +1696,6 @@ fail:
         dev->stats.tx_errors++;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        /*
-         * FIXME: According to a patch from 2003-02-26, "returning non-zero
-         * causes serious problems" here, allegedly.  Before that patch,
-         * -ERRNO was returned which is not appropriate under Linux 2.6.
-         * Perhaps more needs to be done?  Stop the queue in serious
-         * conditions and restart it elsewhere?
-         */
-        /* return NETDEV_TX_BUSY; */
         return NETDEV_TX_OK;
 }