diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2018-07-19 12:43:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-21 19:12:29 +0200 |
| commit | 70551dc46ffa3555a0b5f3545b0cd87ab67fd002 (patch) | |
| tree | 07a791c55d815660b1231b967d06cb8098d57b62 /drivers/s390 | |
| parent | s390/qeth: fix race in used-buffer accounting (diff) | |
| download | linux-70551dc46ffa3555a0b5f3545b0cd87ab67fd002.tar.xz linux-70551dc46ffa3555a0b5f3545b0cd87ab67fd002.zip | |
s390/qeth: reset layer2 attribute on layer switch
After the subdriver's remove() routine has completed, the card's layer
mode is undetermined again. Reflect this in the layer2 field.
If qeth_dev_layer2_store() hits an error after remove() was called, the
card _always_ requires a setup(), even if the previous layer mode is
requested again.
But qeth_dev_layer2_store() bails out early if the requested layer mode
still matches the current one. So unless we reset the layer2 field,
re-probing the card back to its previous mode is currently not possible.
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_core_sys.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c index c3f18afb368b..cfb659747693 100644 --- a/drivers/s390/net/qeth_core_sys.c +++ b/drivers/s390/net/qeth_core_sys.c @@ -426,6 +426,7 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, if (card->discipline) { card->discipline->remove(card->gdev); qeth_core_free_discipline(card); + card->options.layer2 = -1; } rc = qeth_core_load_discipline(card, newdis); |