diff options
Diffstat (limited to 'kernel/drivers/net/caif')
| -rw-r--r-- | kernel/drivers/net/caif/caif_hsi.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/net/caif/caif_serial.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/net/caif/caif_spi.c | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/kernel/drivers/net/caif/caif_hsi.c b/kernel/drivers/net/caif/caif_hsi.c index b3b922adc..615c65da3 100644 --- a/kernel/drivers/net/caif/caif_hsi.c +++ b/kernel/drivers/net/caif/caif_hsi.c @@ -1120,7 +1120,7 @@ static void cfhsi_setup(struct net_device *dev) dev->type = ARPHRD_CAIF; dev->flags = IFF_POINTOPOINT | IFF_NOARP; dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ; - dev->tx_queue_len = 0; + dev->priv_flags |= IFF_NO_QUEUE; dev->destructor = free_netdev; dev->netdev_ops = &cfhsi_netdevops; for (i = 0; i < CFHSI_PRIO_LAST; ++i) diff --git a/kernel/drivers/net/caif/caif_serial.c b/kernel/drivers/net/caif/caif_serial.c index 9da065372..c2dea4916 100644 --- a/kernel/drivers/net/caif/caif_serial.c +++ b/kernel/drivers/net/caif/caif_serial.c @@ -427,7 +427,7 @@ static void caifdev_setup(struct net_device *dev) dev->type = ARPHRD_CAIF; dev->flags = IFF_POINTOPOINT | IFF_NOARP; dev->mtu = CAIF_MAX_MTU; - dev->tx_queue_len = 0; + dev->priv_flags |= IFF_NO_QUEUE; dev->destructor = free_netdev; skb_queue_head_init(&serdev->head); serdev->common.link_select = CAIF_LINK_LOW_LATENCY; diff --git a/kernel/drivers/net/caif/caif_spi.c b/kernel/drivers/net/caif/caif_spi.c index 72ea9ff9b..4721948a9 100644 --- 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; |