Commit 4676a152 authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller

net: caif: convert to using IFF_NO_QUEUE

Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Cc: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ad09c5c
...@@ -1120,7 +1120,7 @@ static void cfhsi_setup(struct net_device *dev) ...@@ -1120,7 +1120,7 @@ static void cfhsi_setup(struct net_device *dev)
dev->type = ARPHRD_CAIF; dev->type = ARPHRD_CAIF;
dev->flags = IFF_POINTOPOINT | IFF_NOARP; dev->flags = IFF_POINTOPOINT | IFF_NOARP;
dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ; dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ;
dev->tx_queue_len = 0; dev->priv_flags |= IFF_NO_QUEUE;
dev->destructor = free_netdev; dev->destructor = free_netdev;
dev->netdev_ops = &cfhsi_netdevops; dev->netdev_ops = &cfhsi_netdevops;
for (i = 0; i < CFHSI_PRIO_LAST; ++i) for (i = 0; i < CFHSI_PRIO_LAST; ++i)
......
...@@ -427,7 +427,7 @@ static void caifdev_setup(struct net_device *dev) ...@@ -427,7 +427,7 @@ static void caifdev_setup(struct net_device *dev)
dev->type = ARPHRD_CAIF; dev->type = ARPHRD_CAIF;
dev->flags = IFF_POINTOPOINT | IFF_NOARP; dev->flags = IFF_POINTOPOINT | IFF_NOARP;
dev->mtu = CAIF_MAX_MTU; dev->mtu = CAIF_MAX_MTU;
dev->tx_queue_len = 0; dev->priv_flags |= IFF_NO_QUEUE;
dev->destructor = free_netdev; dev->destructor = free_netdev;
skb_queue_head_init(&serdev->head); skb_queue_head_init(&serdev->head);
serdev->common.link_select = CAIF_LINK_LOW_LATENCY; serdev->common.link_select = CAIF_LINK_LOW_LATENCY;
......
...@@ -710,7 +710,7 @@ static void cfspi_setup(struct net_device *dev) ...@@ -710,7 +710,7 @@ static void cfspi_setup(struct net_device *dev)
dev->netdev_ops = &cfspi_ops; dev->netdev_ops = &cfspi_ops;
dev->type = ARPHRD_CAIF; dev->type = ARPHRD_CAIF;
dev->flags = IFF_NOARP | IFF_POINTOPOINT; dev->flags = IFF_NOARP | IFF_POINTOPOINT;
dev->tx_queue_len = 0; dev->priv_flags |= IFF_NO_QUEUE;
dev->mtu = SPI_MAX_PAYLOAD_SIZE; dev->mtu = SPI_MAX_PAYLOAD_SIZE;
dev->destructor = free_netdev; dev->destructor = free_netdev;
skb_queue_head_init(&cfspi->qhead); skb_queue_head_init(&cfspi->qhead);
......
...@@ -1096,7 +1096,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) ...@@ -1096,7 +1096,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
} }
dev->netdev_ops = &pvc_ops; dev->netdev_ops = &pvc_ops;
dev->mtu = HDLC_MAX_MTU; dev->mtu = HDLC_MAX_MTU;
dev->tx_queue_len = 0; dev->priv_flags |= IFF_NO_QUEUE;
dev->ml_priv = pvc; dev->ml_priv = pvc;
if (register_netdevice(dev) != 0) { if (register_netdevice(dev) != 0) {
......
...@@ -177,7 +177,7 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt) ...@@ -177,7 +177,7 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt)
skb->protocol = htons(ETH_P_CAIF); skb->protocol = htons(ETH_P_CAIF);
/* Check if we need to handle xoff */ /* Check if we need to handle xoff */
if (likely(caifd->netdev->tx_queue_len == 0)) if (likely(caifd->netdev->priv_flags & IFF_NO_QUEUE))
goto noxoff; goto noxoff;
if (unlikely(caifd->xoff)) if (unlikely(caifd->xoff))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment