s390/qeth: Fix error handling during VNICC initialization (b528965b) · Commits · 戴 / test

drivers/s390/net/qeth_l2_main.c

+7 −4

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,7 +2045,10 @@ 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 (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;
		@@ -2054,7 +2057,7 @@ static void qeth_l2_vnicc_init(struct qeth_card *card)
		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;