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

Commit 8cd6f4fe authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 's390-qeth-fixes' 



Julian Wiedmann says:

====================
s390/qeth: fixes 2019-10-08

Alexandra fixes two issues in the initialization code for vnicc cmds.
One is an uninitialized variable when a cmd fails, the other that we
wouldn't recover correctly if the device's supported features changed.
====================

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parents 9db74e51 be40a86c

drivers/s390/net/qeth_l2_main.c

+15 −8
Original line number Diff line number Diff line
@@ -2021,10 +2021,10 @@ static bool qeth_l2_vnicc_recover_char(struct qeth_card *card, u32 vnicc, 
static void qeth_l2_vnicc_init(struct qeth_card *card)

{

	u32 *timeout = &card->options.vnicc.learning_timeout;

	bool enable, error = false;

	unsigned int chars_len, i;

	unsigned long chars_tmp;

	u32 sup_cmds, vnicc;

	bool enable, error;



	QETH_CARD_TEXT(card, 2, "vniccini");

	/* reset rx_bcast */
@@ -2045,16 +2045,23 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) 
	chars_len = sizeof(card->options.vnicc.sup_chars) * BITS_PER_BYTE;

	for_each_set_bit(i, &chars_tmp, chars_len) {

		vnicc = BIT(i);

		qeth_l2_vnicc_query_cmds(card, vnicc, &sup_cmds);

		if (!(sup_cmds & IPA_VNICC_SET_TIMEOUT) ||

		    !(sup_cmds & IPA_VNICC_GET_TIMEOUT))

		if (qeth_l2_vnicc_query_cmds(card, vnicc, &sup_cmds)) {

			sup_cmds = 0;

			error = true;

		}

		if ((sup_cmds & IPA_VNICC_SET_TIMEOUT) &&

		    (sup_cmds & IPA_VNICC_GET_TIMEOUT))

			card->options.vnicc.getset_timeout_sup |= vnicc;

		else

			card->options.vnicc.getset_timeout_sup &= ~vnicc;

		if (!(sup_cmds & IPA_VNICC_ENABLE) ||

		    !(sup_cmds & IPA_VNICC_DISABLE))

		if ((sup_cmds & IPA_VNICC_ENABLE) &&

		    (sup_cmds & IPA_VNICC_DISABLE))

			card->options.vnicc.set_char_sup |= vnicc;

		else

			card->options.vnicc.set_char_sup &= ~vnicc;

	}

	/* enforce assumed default values and recover settings, if changed  */

	error = qeth_l2_vnicc_recover_timeout(card, QETH_VNICC_LEARNING,

	error |= qeth_l2_vnicc_recover_timeout(card, QETH_VNICC_LEARNING,

					       timeout);

	chars_tmp = card->options.vnicc.wanted_chars ^ QETH_VNICC_DEFAULT;

	chars_tmp |= QETH_VNICC_BRIDGE_INVISIBLE;