diff options
| author | Julian Wiedmann <jwi@linux.vnet.ibm.com> | 2017-08-15 17:02:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-15 10:58:39 -0700 |
| commit | 7b1115bbb700c7e46923bbbf007c04f04230873c (patch) | |
| tree | 5243f30b7cb7c81bc8233f99814a45b0813cf28c /drivers/s390/net | |
| parent | 886e1974dcc5866cbc3d133d1f3d2cc26af68cfc (diff) | |
| download | linux-7b1115bbb700c7e46923bbbf007c04f04230873c.tar.gz linux-7b1115bbb700c7e46923bbbf007c04f04230873c.tar.bz2 linux-7b1115bbb700c7e46923bbbf007c04f04230873c.zip | |
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: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 28c9a7eda507..a6ba897ed707 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -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 || |