s390/qeth: reset layer2 attribute on layer switch

julianwiedmann · davem330 · commit 70551dc46ffa · 2018-07-21T10:12:29.000-07:00
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 &lt;jwi@linux.ibm.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,7 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,`
`426`	`426`	`if (card->discipline) {`
`427`	`427`	`card->discipline->remove(card->gdev);`
`428`	`428`	`qeth_core_free_discipline(card);`
	`429`	`+ card->options.layer2 = -1;`
`429`	`430`	`}`
`430`	`431`
`431`	`432`	`rc = qeth_core_load_discipline(card, newdis);`