diff options
| author |   Alexandra Winter <wintera@linux.ibm.com> | 2019-12-23 15:03:24 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-24 22:41:06 -0800 |
| commit | e8a66d800471e2df7f0b484e2e46898b21d1fa82 (patch) | |
| tree | 732b36f28e64e2fa813febe031310ba698b66f5d /drivers/s390/net/qeth_l2_main.c | |
| parent | s390/qeth: fix false reporting of VNIC CHAR config failure (diff) | |
| download | linux-dev-e8a66d800471e2df7f0b484e2e46898b21d1fa82.tar.xz linux-dev-e8a66d800471e2df7f0b484e2e46898b21d1fa82.zip | |
s390/qeth: Fix vnicc_is_in_use if rx_bcast not set
Symptom: After vnicc/rx_bcast has been manually set to 0,
bridge_* sysfs parameters can still be set or written.
Only occurs on HiperSockets, as OSA doesn't support changing rx_bcast.
Vnic characteristics and bridgeport settings are mutually exclusive.
rx_bcast defaults to 1, so manually setting it to 0 should disable
bridge_* parameters.
Instead it makes sense here to check the supported mask. If the card
does not support vnicc at all, bridge commands are always allowed.
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 '')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index fc5d8ed3a737..8024a2112a87 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -1952,8 +1952,7 @@ int qeth_l2_vnicc_get_timeout(struct qeth_card *card, u32 *timeout) /* check if VNICC is currently enabled */ bool qeth_l2_vnicc_is_in_use(struct qeth_card *card) { - /* if everything is turned off, VNICC is not active */ - if (!card->options.vnicc.cur_chars) + if (!card->options.vnicc.sup_chars) return false; /* default values are only OK if rx_bcast was not enabled by user * or the card is offline. |