From: Julian Wiedmann <jwi@linux.vnet.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.vnet.ibm.com>,
Ursula Braun <ubraun@linux.vnet.ibm.com>,
Julian Wiedmann <jwi@linux.vnet.ibm.com>
Subject: [PATCH net-next 3/9] s390/qeth: query IPv6 IPA support on HiperSockets
Date: Tue, 6 Jun 2017 14:33:44 +0200 [thread overview]
Message-ID: <20170606123350.13781-4-jwi@linux.vnet.ibm.com> (raw)
In-Reply-To: <20170606123350.13781-1-jwi@linux.vnet.ibm.com>
HiperSocket devices don't need the full IPv6 initialization, but we
should still query the supported assists for logging purposes.
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
---
drivers/s390/net/qeth_l3_main.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 56e813972d77..fb4eee2a46ee 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1035,9 +1035,6 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
QETH_CARD_TEXT(card, 3, "softipv6");
- if (card->info.type == QETH_CARD_TYPE_IQD)
- goto out;
-
rc = qeth_query_ipassists(card, QETH_PROT_IPV6);
if (rc) {
dev_err(&card->gdev->dev,
@@ -1045,6 +1042,10 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
QETH_CARD_IFNAME(card));
return rc;
}
+
+ if (card->info.type == QETH_CARD_TYPE_IQD)
+ goto out;
+
rc = qeth_send_simple_setassparms(card, IPA_IPV6,
IPA_CMD_ASS_START, 3);
if (rc) {
--
2.11.2
next prev parent reply other threads:[~2017-06-06 12:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 12:33 [PATCH net-next 0/9] s390/net updates Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 1/9] s390/qeth: remove support for IPA_IP_FRAGMENTATION Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 2/9] s390/qeth: remove skb_is_nonlinear() check on IQD Julian Wiedmann
2017-06-06 12:33 ` Julian Wiedmann [this message]
2017-06-06 12:33 ` [PATCH net-next 4/9] s390/qeth: log bridgeport capabilities Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 5/9] s390/qeth: add missing strings for IPA return codes Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 6/9] s390/qeth: consolidate pack buffer flushing Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 7/9] s390/qeth: silence qeth_fix_features() Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 8/9] s390/qeth: add support for early L3 device setup Julian Wiedmann
2017-06-06 12:33 ` [PATCH net-next 9/9] s390/qeth: do early device setup for z/VM IQD NICs Julian Wiedmann
2017-06-06 17:06 ` [PATCH net-next 0/9] s390/net updates 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=20170606123350.13781-4-jwi@linux.vnet.ibm.com \
--to=jwi@linux.vnet.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.vnet.ibm.com \
--cc=schwidefsky@de.ibm.com \
--cc=ubraun@linux.vnet.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).