Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / net / hsr / hsr_device.c

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 44d27469ae55982d1895021b79ba76a85c1324a8..35a9788bb3ae734d8e5b2f5199901a6c47f7a587 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -392,7 +392,7 @@ void hsr_dev_setup(struct net_device *dev)
        dev->header_ops = &hsr_header_ops;
        dev->netdev_ops = &hsr_device_ops;
        SET_NETDEV_DEVTYPE(dev, &hsr_type);
-       dev->tx_queue_len = 0;
+       dev->priv_flags |= IFF_NO_QUEUE;
 
        dev->destructor = hsr_dev_destroy;