blob: aa5934f768bbac0dd457e24f1c3d6be67b6c2c9d [file] [log] [blame]
From 5043554c0b74112a399ff04e726ffbe3aed6c249 Mon Sep 17 00:00:00 2001
From: Alexandra Winter <>
Date: Mon, 23 Dec 2019 15:03:23 +0100
Subject: [PATCH] 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: caa1f0b10d18 ("s390/qeth: add VNICC enable/disable support")
Signed-off-by: Alexandra Winter <>
Reviewed-by: Julian Wiedmann <>
Signed-off-by: Julian Wiedmann <>
Signed-off-by: David S. Miller <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 2e2cf4f16067..00fa8f058c21 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -2140,7 +2140,6 @@ static void qeth_l2_vnicc_init(struct qeth_card *card)
error = qeth_l2_vnicc_recover_timeout(card, QETH_VNICC_LEARNING,
chars_tmp = card->options.vnicc.wanted_chars ^ QETH_VNICC_DEFAULT;
chars_len = sizeof(card->options.vnicc.wanted_chars) * BITS_PER_BYTE;
for_each_set_bit(i, &chars_tmp, chars_len) {
vnicc = BIT(i);