Merge git://git.infradead.org/mtd-2.6

[mirror_ubuntu-bionic-kernel.git] / drivers / net / hamradio / hdlcdrv.c

diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 61de56e45eedb509bc33bca2ed120b4868ab5c7f..d034f8ca63cb9a3b1b5aa18aefd9892e4abd9f1e 100644 (file)
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -409,7 +409,7 @@ static int hdlcdrv_send_packet(struct sk_buff *skb, struct net_device *dev)
                return 0;
        }
        if (sm->skb)
-               return -1;
+               return NETDEV_TX_LOCKED;
        netif_stop_queue(dev);
        sm->skb = skb;
        return 0;