Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee75fb86 authored Apr 26, 2018 by Kittipon Meesompop Committed by David S. Miller Apr 27, 2018

s390/qeth: query IPv6 assists during hardsetup

For new functionality, the L2 subdriver will start using IPv6 assists.
So move the query from the L3 subdriver into the common setup path.

Signed-off-by: Kittipon Meesompop <kmeesomp@linux.vnet.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3aade31b

drivers/s390/net/qeth_core_main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -5201,6 +5201,11 @@ int qeth_core_hardsetup_card(struct qeth_card *card)
		rc = qeth_query_ipassists(card, QETH_PROT_IPV4);
		if (rc == -ENOMEM)
		goto out;
		if (qeth_is_supported(card, IPA_IPV6)) {
		rc = qeth_query_ipassists(card, QETH_PROT_IPV6);
		if (rc == -ENOMEM)
		goto out;
		}
		if (qeth_is_supported(card, IPA_SETADAPTERPARMS)) {
		rc = qeth_query_setadapterparms(card);
		if (rc < 0) {

drivers/s390/net/qeth_l3_main.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -851,14 +851,6 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)

		QETH_CARD_TEXT(card, 3, "softipv6");

		rc = qeth_query_ipassists(card, QETH_PROT_IPV6);
		if (rc) {
		dev_err(&card->gdev->dev,
		"Activating IPv6 support for %s failed\n",
		QETH_CARD_IFNAME(card));
		return rc;
		}

		if (card->info.type == QETH_CARD_TYPE_IQD)
		goto out;