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

[~andy/linux] / drivers / ieee802154 / fakehard.c

diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index c1c9697f9fde2353e605b855fb2e5ad10aa6318d..96a2959ce877e10905acfcc84cb1897e874d7143 100644 (file)
--- a/drivers/ieee802154/fakehard.c
+++ b/drivers/ieee802154/fakehard.c
@@ -257,7 +257,8 @@ static int ieee802154_fake_close(struct net_device *dev)
        return 0;
 }
 
-static int ieee802154_fake_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,
+                                             struct net_device *dev)
 {
        skb->iif = dev->ifindex;
        skb->dev = dev;