Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[mv-sheeva.git] / net / netrom / nr_dev.c

diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 351372463fedd23f5c61bd9b016cb8337c800f07..7aa11b01b2e240890fef4d8503142011d8d3f33b 100644 (file)
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -169,7 +169,7 @@ static int nr_close(struct net_device *dev)
        return 0;
 }
 
-static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t nr_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct net_device_stats *stats = &dev->stats;
        unsigned int len = skb->len;
@@ -177,13 +177,13 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
        if (!nr_route_frame(skb, NULL)) {
                kfree_skb(skb);
                stats->tx_errors++;
-               return 0;
+               return NETDEV_TX_OK;
        }
 
        stats->tx_packets++;
        stats->tx_bytes += len;
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static const struct header_ops nr_header_ops = {