s390/qeth: only init the isolation mode when necessary (08e95cae) · Commits · 戴 / test

A newly initialized device defaults to ISOLATION_MODE_NONE, don't bother with programming this a second time. Then remove the OSD/OSX check, it's already done in the sysfs path whenever the user actually changes the configuration. Signed-off-by:

Julian Wiedmann <jwi@linux.ibm.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/s390/net/qeth_core_main.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -4663,8 +4663,7 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback)

		QETH_CARD_TEXT(card, 4, "setactlo");

		if ((IS_OSD(card) \|\| IS_OSX(card)) &&
		qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {
		if (qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {
		rc = qeth_setadpparms_set_access_ctrl(card,
		card->options.isolation, fallback);
		if (rc) {
		@@ -5347,9 +5346,11 @@ retriable:
		(card->info.hwtrap && qeth_hw_trap(card, QETH_DIAGS_TRAP_ARM)))
		card->info.hwtrap = 0;

		if (card->options.isolation != ISOLATION_MODE_NONE) {
		rc = qeth_set_access_ctrl_online(card, 0);
		if (rc)
		goto out;
		}

		rc = qeth_init_qdio_queues(card);
		if (rc) {

Admin message