net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

[linux-block.git] / net / irda / irlan / irlan_eth.c

diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 05112be99569f3eab7eb785cbbc00c9a0e749ec8..64230cffcfee112c7a1f31629744e8e2ef8a6d01 100644 (file)
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -45,6 +45,16 @@ static int  irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev);
 static void irlan_eth_set_multicast_list( struct net_device *dev);
 static struct net_device_stats *irlan_eth_get_stats(struct net_device *dev);
 
+static const struct net_device_ops irlan_eth_netdev_ops = {
+       .ndo_open               = irlan_eth_open,
+       .ndo_stop               = irlan_eth_close,
+       .ndo_start_xmit         = irlan_eth_xmit,
+       .ndo_get_stats          = irlan_eth_get_stats,
+       .ndo_set_multicast_list = irlan_eth_set_multicast_list,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_validate_addr      = eth_validate_addr,
+};
+
 /*
  * Function irlan_eth_setup (dev)
  *
@@ -53,14 +63,11 @@ static struct net_device_stats *irlan_eth_get_stats(struct net_device *dev);
  */
 static void irlan_eth_setup(struct net_device *dev)
 {
-       dev->open               = irlan_eth_open;
-       dev->stop               = irlan_eth_close;
-       dev->hard_start_xmit    = irlan_eth_xmit;
-       dev->get_stats          = irlan_eth_get_stats;
-       dev->set_multicast_list = irlan_eth_set_multicast_list;
+       ether_setup(dev);
+
+       dev->netdev_ops         = &irlan_eth_netdev_ops;
        dev->destructor         = free_netdev;
 
-       ether_setup(dev);
 
        /*
         * Lets do all queueing in IrTTP instead of this device driver.
@@ -170,7 +177,7 @@ static int irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 
                /* Did the realloc succeed? */
                if (new_skb == NULL)
-                       return 0;
+                       return NETDEV_TX_OK;
 
                /* Use the new skb instead */
                skb = new_skb;
@@ -202,7 +209,7 @@ static int irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev)
                self->stats.tx_bytes += skb->len;
        }
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /*