s390/qeth: reset layer2 attribute on layer switch
authorJulian Wiedmann <jwi@linux.ibm.com>
Thu, 19 Jul 2018 10:43:49 +0000 (12:43 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Jul 2018 17:12:29 +0000 (10:12 -0700)
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>
drivers/s390/net/qeth_core_sys.c

index c3f18af..cfb6597 100644 (file)
@@ -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);