Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / drivers / net / loopback.c

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index da472c6..1bc654a 100644 (file)
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -69,7 +69,8 @@ struct pcpu_lstats {
  * The higher levels take care of making this non-reentrant (it's
  * called with bh's disabled).
  */
-static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t loopback_xmit(struct sk_buff *skb,
+                                struct net_device *dev)
 {
        struct pcpu_lstats *pcpu_lstats, *lb_stats;
        int len;
@@ -89,7 +90,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
        } else
                lb_stats->drops++;
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static struct net_device_stats *loopback_get_stats(struct net_device *dev)