These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / caif / caif_spi.c

diff --git a/kernel/drivers/net/caif/caif_spi.c b/kernel/drivers/net/caif/caif_spi.c
index 72ea9ff..4721948 100644 (file)
--- a/kernel/drivers/net/caif/caif_spi.c
+++ b/kernel/drivers/net/caif/caif_spi.c
@@ -710,7 +710,7 @@ static void cfspi_setup(struct net_device *dev)
        dev->netdev_ops = &cfspi_ops;
        dev->type = ARPHRD_CAIF;
        dev->flags = IFF_NOARP | IFF_POINTOPOINT;
-       dev->tx_queue_len = 0;
+       dev->priv_flags |= IFF_NO_QUEUE;
        dev->mtu = SPI_MAX_PAYLOAD_SIZE;
        dev->destructor = free_netdev;
        skb_queue_head_init(&cfspi->qhead);
@@ -730,11 +730,14 @@ int cfspi_spi_probe(struct platform_device *pdev)
        int res;
        dev = (struct cfspi_dev *)pdev->dev.platform_data;
 
-       ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d",
-                           NET_NAME_UNKNOWN, cfspi_setup);
        if (!dev)
                return -ENODEV;
 
+       ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d",
+                           NET_NAME_UNKNOWN, cfspi_setup);
+       if (!ndev)
+               return -ENOMEM;
+
        cfspi = netdev_priv(ndev);
        netif_stop_queue(ndev);
        cfspi->ndev = ndev;