Browse Source

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>
Julian Wiedmann 7 years ago
parent
commit
70551dc46f
1 changed files with 1 additions and 0 deletions
  1. 1 0
      drivers/s390/net/qeth_core_sys.c

+ 1 - 0
drivers/s390/net/qeth_core_sys.c

@@ -426,6 +426,7 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
 	if (card->discipline) {
 	if (card->discipline) {
 		card->discipline->remove(card->gdev);
 		card->discipline->remove(card->gdev);
 		qeth_core_free_discipline(card);
 		qeth_core_free_discipline(card);
+		card->options.layer2 = -1;
 	}
 	}
 
 
 	rc = qeth_core_load_discipline(card, newdis);
 	rc = qeth_core_load_discipline(card, newdis);