Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / plip.c

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 2ca8b0d84ee2d7f2647e3064e6f1615f116c1294..00487f569cfdbc21381d0c021ec04a3d5332336b 100644 (file)
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -990,7 +990,7 @@ plip_tx_packet(struct sk_buff *skb, struct net_device *dev)
        schedule_work(&nl->immediate);
        spin_unlock_irq(&nl->lock);
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static void