Skip to content

Commit 4676a15

Browse files
Phil Sutterdavem330
authored andcommitted
net: caif: convert to using IFF_NO_QUEUE
Signed-off-by: Phil Sutter <[email protected]> Cc: Dmitry Tarnyagin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9ad09c5 commit 4676a15

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

drivers/net/caif/caif_hsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ static void cfhsi_setup(struct net_device *dev)
11201120
dev->type = ARPHRD_CAIF;
11211121
dev->flags = IFF_POINTOPOINT | IFF_NOARP;
11221122
dev->mtu = CFHSI_MAX_CAIF_FRAME_SZ;
1123-
dev->tx_queue_len = 0;
1123+
dev->priv_flags |= IFF_NO_QUEUE;
11241124
dev->destructor = free_netdev;
11251125
dev->netdev_ops = &cfhsi_netdevops;
11261126
for (i = 0; i < CFHSI_PRIO_LAST; ++i)

drivers/net/caif/caif_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static void caifdev_setup(struct net_device *dev)
427427
dev->type = ARPHRD_CAIF;
428428
dev->flags = IFF_POINTOPOINT | IFF_NOARP;
429429
dev->mtu = CAIF_MAX_MTU;
430-
dev->tx_queue_len = 0;
430+
dev->priv_flags |= IFF_NO_QUEUE;
431431
dev->destructor = free_netdev;
432432
skb_queue_head_init(&serdev->head);
433433
serdev->common.link_select = CAIF_LINK_LOW_LATENCY;

drivers/net/caif/caif_spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ static void cfspi_setup(struct net_device *dev)
710710
dev->netdev_ops = &cfspi_ops;
711711
dev->type = ARPHRD_CAIF;
712712
dev->flags = IFF_NOARP | IFF_POINTOPOINT;
713-
dev->tx_queue_len = 0;
713+
dev->priv_flags |= IFF_NO_QUEUE;
714714
dev->mtu = SPI_MAX_PAYLOAD_SIZE;
715715
dev->destructor = free_netdev;
716716
skb_queue_head_init(&cfspi->qhead);

drivers/net/wan/hdlc_fr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
10961096
}
10971097
dev->netdev_ops = &pvc_ops;
10981098
dev->mtu = HDLC_MAX_MTU;
1099-
dev->tx_queue_len = 0;
1099+
dev->priv_flags |= IFF_NO_QUEUE;
11001100
dev->ml_priv = pvc;
11011101

11021102
if (register_netdevice(dev) != 0) {

net/caif/caif_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt)
177177
skb->protocol = htons(ETH_P_CAIF);
178178

179179
/* Check if we need to handle xoff */
180-
if (likely(caifd->netdev->tx_queue_len == 0))
180+
if (likely(caifd->netdev->priv_flags & IFF_NO_QUEUE))
181181
goto noxoff;
182182

183183
if (unlikely(caifd->xoff))

0 commit comments

Comments
 (0)