Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b1115bb authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: remove extra L2 adapterparms query 



qeth_l2_request_initial_mac() queries the device for its supported
adapterparms, even though they already have been queried as part of the
device's high-level setup. Remove that extra call.

The only call chain for qeth_l2_request_initial_mac() is
__qeth_l2_set_online()
	qeth_core_hardsetup_card()
		qeth_query_setadapterparms()
	qeth_l2_setup_netdev()
		qeth_l2_request_initial_mac()
			qeth_query_setadapterparms()

, and we only reach qeth_l2_request_initial_mac() if the first
adapterparms query succeeds. Hence removing the second query results in
no loss of functionality.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 886e1974

drivers/s390/net/qeth_l2_main.c

+0 −9
Original line number Diff line number Diff line
@@ -519,15 +519,6 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
		/* fall back to alternative mechanism: */

	}



	if (qeth_is_supported(card, IPA_SETADAPTERPARMS)) {

		rc = qeth_query_setadapterparms(card);

		if (rc) {

			QETH_DBF_MESSAGE(2, "could not query adapter "

				"parameters on device %s: x%x\n",

				CARD_BUS_ID(card), rc);

		}

	}



	if (card->info.type == QETH_CARD_TYPE_IQD ||

	    card->info.type == QETH_CARD_TYPE_OSM ||

	    card->info.type == QETH_CARD_TYPE_OSX ||