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

Commit a134884a authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller
Browse files

qeth: Fix IPA_CMD_QIPASSIST return code handling 



Return codes of IPA_CMD_QIPASSIST are not checked, especially the ones which
indicate that the command is not supported. As a result, the device driver
would not enable all available features on older card generations.
This patch adds proper checking and sets the bare minimum in the supported
functions flags to avoid follow-on errors.

Signed-off-by: default avatarStefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80928805

drivers/s390/net/qeth_core_main.c

+22 −2
Original line number Diff line number Diff line
@@ -2942,13 +2942,33 @@ static int qeth_query_ipassists_cb(struct qeth_card *card, 
	QETH_DBF_TEXT(SETUP, 2, "qipasscb");



	cmd = (struct qeth_ipa_cmd *) data;



	switch (cmd->hdr.return_code) {

	case IPA_RC_NOTSUPP:

	case IPA_RC_L2_UNSUPPORTED_CMD:

		QETH_DBF_TEXT(SETUP, 2, "ipaunsup");

		card->options.ipa4.supported_funcs |= IPA_SETADAPTERPARMS;

		card->options.ipa6.supported_funcs |= IPA_SETADAPTERPARMS;

		return -0;

	default:

		if (cmd->hdr.return_code) {

			QETH_DBF_MESSAGE(1, "%s IPA_CMD_QIPASSIST: Unhandled "

						"rc=%d\n",

						dev_name(&card->gdev->dev),

						cmd->hdr.return_code);

			return 0;

		}

	}



	if (cmd->hdr.prot_version == QETH_PROT_IPV4) {

		card->options.ipa4.supported_funcs = cmd->hdr.ipa_supported;

		card->options.ipa4.enabled_funcs = cmd->hdr.ipa_enabled;

	} else {

	} else if (cmd->hdr.prot_version == QETH_PROT_IPV6) {

		card->options.ipa6.supported_funcs = cmd->hdr.ipa_supported;

		card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled;

	}

	} else

		QETH_DBF_MESSAGE(1, "%s IPA_CMD_QIPASSIST: Flawed LIC detected"

					"\n", dev_name(&card->gdev->dev));

	QETH_DBF_TEXT(SETUP, 2, "suppenbl");

	QETH_DBF_TEXT_(SETUP, 2, "%08x", (__u32)cmd->hdr.ipa_supported);

	QETH_DBF_TEXT_(SETUP, 2, "%08x", (__u32)cmd->hdr.ipa_enabled);

drivers/s390/net/qeth_l2_main.c

+7 −4
Original line number Diff line number Diff line
@@ -626,10 +626,13 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
	QETH_DBF_TEXT(SETUP, 2, "doL2init");

	QETH_DBF_TEXT_(SETUP, 2, "doL2%s", CARD_BUS_ID(card));



	if (qeth_is_supported(card, IPA_SETADAPTERPARMS)) {

		rc = qeth_query_setadapterparms(card);

		if (rc) {

		QETH_DBF_MESSAGE(2, "could not query adapter parameters on "

			"device %s: x%x\n", CARD_BUS_ID(card), rc);

			QETH_DBF_MESSAGE(2, "could not query adapter "

				"parameters on device %s: x%x\n",

				CARD_BUS_ID(card), rc);

		}

	}



	if (card->info.type == QETH_CARD_TYPE_IQD ||