From: Phil Sutter <phil@nwl.cc>
To: netdev@vger.kernel.org
Cc: brouer@redhat.com, davem@davemloft.net,
Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
Subject: [PATCH 18/21] net: caif: convert to using IFF_NO_QUEUE
Date: Tue, 18 Aug 2015 10:30:46 +0200 [thread overview]
Message-ID: <1439886649-24166-19-git-send-email-phil@nwl.cc> (raw)
In-Reply-To: <1439886649-24166-18-git-send-email-phil@nwl.cc>
Signed-off-by: Phil Sutter <phil@nwl.cc>
Cc: Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
---
drivers/net/caif/caif_hsi.c | 2 +-
drivers/net/caif/caif_serial.c | 2 +-
drivers/net/caif/caif_spi.c | 2 +-
drivers/net/wan/hdlc_fr.c | 2 +-
net/caif/caif_dev.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index b3b922a..615c65d 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/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/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index 9da0653..c2dea49 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/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/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index 72ea9ff..de39620 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/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);
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 3ebed1c..e92aaf6 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1096,7 +1096,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
}
dev->netdev_ops = &pvc_ops;
dev->mtu = HDLC_MAX_MTU;
- dev->tx_queue_len = 0;
+ dev->priv_flags |= IFF_NO_QUEUE;
dev->ml_priv = pvc;
if (register_netdevice(dev) != 0) {
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index edbca46..d730a0f 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -177,7 +177,7 @@ static int transmit(struct cflayer *layer, struct cfpkt *pkt)
skb->protocol = htons(ETH_P_CAIF);
/* 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;
if (unlikely(caifd->xoff))
--
2.1.2
next prev parent reply other threads:[~2015-08-18 8:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 8:30 [PATCH 00/21] net: Convert drivers to IFF_NO_QUEUE and cleanup afterwards Phil Sutter
2015-08-18 8:30 ` [PATCH 01/21] net: veth: enable noqueue operation by default Phil Sutter
2015-08-18 8:30 ` [PATCH 02/21] net: dummy: convert to using IFF_NO_QUEUE Phil Sutter
2015-08-18 8:30 ` [PATCH 03/21] net: geneve: " Phil Sutter
2015-08-18 8:30 ` [PATCH 04/21] net: loopback: " Phil Sutter
2015-08-18 8:30 ` [PATCH 05/21] net: nlmon: " Phil Sutter
2015-08-18 8:30 ` [PATCH 06/21] net: team: " Phil Sutter
2015-08-18 8:30 ` [PATCH 07/21] net: vxlan: " Phil Sutter
2015-08-18 8:30 ` [PATCH 08/21] net: 8021q: " Phil Sutter
2015-08-18 8:30 ` [PATCH 09/21] net: bridge: " Phil Sutter
2015-08-18 8:30 ` [PATCH 10/21] net: 6lowpan: " Phil Sutter
2015-08-18 8:30 ` [PATCH 11/21] net: bonding: " Phil Sutter
2015-08-18 8:30 ` [PATCH 12/21] net: ipvlan: " Phil Sutter
2015-08-18 8:30 ` [PATCH 13/21] net: dsa: " Phil Sutter
2015-08-18 8:30 ` [PATCH 14/21] net: hostap: " Phil Sutter
2015-08-18 8:30 ` [PATCH 15/21] net: mac80211_hwsim: " Phil Sutter
2015-08-18 8:30 ` [PATCH 16/21] net: batman-adv: " Phil Sutter
2015-08-18 8:30 ` [PATCH 17/21] net: hsr: " Phil Sutter
2015-08-18 8:30 ` Phil Sutter [this message]
2015-08-18 8:30 ` [PATCH 19/21] staging: wilc1000: " Phil Sutter
2015-08-18 8:30 ` [PATCH 20/21] net: warn if drivers set tx_queue_len = 0 Phil Sutter
2015-08-18 8:30 ` [PATCH 21/21] net: sched: drop all special handling of tx_queue_len == 0 Phil Sutter
2015-08-18 14:47 ` [PATCH 20/21] net: warn if drivers set tx_queue_len = 0 Eric Dumazet
2015-08-18 18:14 ` Phil Sutter
2015-08-19 18:39 ` Phil Sutter
2015-08-19 20:21 ` Phil Sutter
2015-08-19 20:31 ` Eric Dumazet
2015-08-19 20:33 ` Eric Dumazet
2015-08-19 21:04 ` Phil Sutter
2015-08-18 8:43 ` [PATCH 15/21] net: mac80211_hwsim: convert to using IFF_NO_QUEUE Johannes Berg
2015-08-18 18:54 ` David Miller
2015-08-18 18:56 ` [PATCH 00/21] net: Convert drivers to IFF_NO_QUEUE and cleanup afterwards David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439886649-24166-19-git-send-email-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=dmitry.tarnyagin@lockless.no \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).