diff options
| author | Alexandra Winter <wintera@linux.ibm.com> | 2019-12-23 15:03:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-24 22:41:06 -0800 |
| commit | d1b9ae1864fc3c000e0eb4af8482d78c63e0915a (patch) | |
| tree | b011aa3bf6d4b5553c6094a05d4e8b0a4d7b1434 /drivers/s390 | |
| parent | e8a66d800471e2df7f0b484e2e46898b21d1fa82 (diff) | |
| download | linux-stable-d1b9ae1864fc3c000e0eb4af8482d78c63e0915a.tar.gz linux-stable-d1b9ae1864fc3c000e0eb4af8482d78c63e0915a.tar.bz2 linux-stable-d1b9ae1864fc3c000e0eb4af8482d78c63e0915a.zip | |
s390/qeth: vnicc Fix init to default
During vnicc_init wanted_char should be compared to cur_char and not
to QETH_VNICC_DEFAULT. Without this patch there is no way to enforce
the default values as desired values.
Note, that it is expected, that a card comes online with default values.
This patch was tested with private card firmware.
Fixes: caa1f0b10d18 ("s390/qeth: add VNICC enable/disable support")
Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 8024a2112a87..47d37e75dda6 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -2039,7 +2039,9 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) /* enforce assumed default values and recover settings, if changed */ error |= qeth_l2_vnicc_recover_timeout(card, QETH_VNICC_LEARNING, timeout); - chars_tmp = card->options.vnicc.wanted_chars ^ QETH_VNICC_DEFAULT; + /* Change chars, if necessary */ + chars_tmp = card->options.vnicc.wanted_chars ^ + card->options.vnicc.cur_chars; chars_len = sizeof(card->options.vnicc.wanted_chars) * BITS_PER_BYTE; for_each_set_bit(i, &chars_tmp, chars_len) { vnicc = BIT(i); |