Browse Source

s390/qeth: query IPv6 IPA support on HiperSockets

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Julian Wiedmann 8 years ago
parent
commit
23274596b5
1 changed files with 4 additions and 3 deletions
  1. 4 3
      drivers/s390/net/qeth_l3_main.c

+ 4 - 3
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");
 	QETH_CARD_TEXT(card, 3, "softipv6");
 
 
-	if (card->info.type == QETH_CARD_TYPE_IQD)
-		goto out;
-
 	rc = qeth_query_ipassists(card, QETH_PROT_IPV6);
 	rc = qeth_query_ipassists(card, QETH_PROT_IPV6);
 	if (rc) {
 	if (rc) {
 		dev_err(&card->gdev->dev,
 		dev_err(&card->gdev->dev,
@@ -1045,6 +1042,10 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
 			QETH_CARD_IFNAME(card));
 			QETH_CARD_IFNAME(card));
 		return rc;
 		return rc;
 	}
 	}
+
+	if (card->info.type == QETH_CARD_TYPE_IQD)
+		goto out;
+
 	rc = qeth_send_simple_setassparms(card, IPA_IPV6,
 	rc = qeth_send_simple_setassparms(card, IPA_IPV6,
 					  IPA_CMD_ASS_START, 3);
 					  IPA_CMD_ASS_START, 3);
 	if (rc) {
 	if (rc) {