From: Julian Wiedmann <jwi@linux.ibm.com>
To: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-s390@vger.kernel.org>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Stefan Raspl <raspl@linux.ibm.com>,
Ursula Braun <ubraun@linux.ibm.com>,
Julian Wiedmann <jwi@linux.ibm.com>
Subject: [PATCH net-next 5/8] s390/qeth: remove TX disable from online path
Date: Fri, 25 Jan 2019 15:44:20 +0100 [thread overview]
Message-ID: <20190125144423.81443-6-jwi@linux.ibm.com> (raw)
In-Reply-To: <20190125144423.81443-1-jwi@linux.ibm.com>
At best this is redundant, at worst it papers over a race in the
offline / online code.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
---
drivers/s390/net/qeth_l2_main.c | 2 --
drivers/s390/net/qeth_l3_main.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 3aa11f32dcd5..0d04e5a89341 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -944,8 +944,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
if (card->info.type != QETH_CARD_TYPE_OSN)
qeth_l2_process_vlans(card);
- netif_tx_disable(card->dev);
-
rc = qeth_init_qdio_queues(card);
if (rc) {
QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index b8a2493a6607..2065030e1a62 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2346,7 +2346,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
if (rc)
QETH_DBF_TEXT_(SETUP, 2, "5err%04x", rc);
}
- netif_tx_disable(card->dev);
rc = qeth_init_qdio_queues(card);
if (rc) {
--
2.16.4
next prev parent reply other threads:[~2019-01-25 14:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 14:44 [PATCH net-next 0/8] s390/qeth: updates 2019-01-25 Julian Wiedmann
2019-01-25 14:44 ` [PATCH net-next 1/8] s390/qeth: streamline TX buffer management Julian Wiedmann
2019-01-25 14:44 ` [PATCH net-next 2/8] s390/qeth: remove bogus netif_wake_queue() Julian Wiedmann
2019-01-25 14:44 ` [PATCH net-next 3/8] s390/qeth: consolidate open/stop netdev ops Julian Wiedmann
2019-01-25 14:44 ` [PATCH net-next 4/8] s390/qeth: register MAC address earlier Julian Wiedmann
2019-01-25 14:44 ` Julian Wiedmann [this message]
2019-01-25 14:44 ` [PATCH net-next 6/8] s390/qeth: delay netdevice registration Julian Wiedmann
2019-01-25 14:44 ` [PATCH net-next 7/8] s390/qeth: detach netdevice while card is offline Julian Wiedmann
2019-01-25 14:44 ` [PATCH net-next 8/8] s390/qeth: remove VLAN tracking for L2 devices Julian Wiedmann
2019-01-26 5:24 ` [PATCH net-next 0/8] s390/qeth: updates 2019-01-25 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=20190125144423.81443-6-jwi@linux.ibm.com \
--to=jwi@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=ubraun@linux.ibm.com \
/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).