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

Commit 82338445 authored by Alexandra Winter's avatar Alexandra Winter Committed by Greg Kroah-Hartman
Browse files

s390/qeth: fix false reporting of VNIC CHAR config failure 



commit 68c57bfd52836e31bff33e5e1fc64029749d2c35 upstream.

Symptom: Error message "Configuring the VNIC characteristics failed"
in dmesg whenever an OSA interface on z15 is set online.

The VNIC characteristics get re-programmed when setting a L2 device
online. This follows the selected 'wanted' characteristics - with the
exception that the INVISIBLE characteristic unconditionally gets
switched off.

For devices that don't support INVISIBLE (ie. OSA), the resulting
IO failure raises a noisy error message
("Configuring the VNIC characteristics failed").
For IQD, INVISIBLE is off by default anyways.

So don't unnecessarily special-case the INVISIBLE characteristic, and
thereby suppress the misleading error message on OSA devices.

Fixes: caa1f0b1 ("s390/qeth: add VNICC enable/disable support")
Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Reviewed-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eaf7b9d1

drivers/s390/net/qeth_l2_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2367,7 +2367,6 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) 
	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;

	chars_len = sizeof(card->options.vnicc.wanted_chars) * BITS_PER_BYTE;

	for_each_set_bit(i, &chars_tmp, chars_len) {

		vnicc = BIT(i);