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

Commit 12b409dd authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: don't erase configuration while probing 



The HW trap and VNICC configuration is exposed via sysfs, and may have
already been modified when qeth_l?_probe_device() attempts to initialize
them. So (1) initialize the VNICC values a little earlier, and (2) don't
bother about the HW trap mode, it was already initialized before.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fae846e2

drivers/s390/net/qeth_l2_main.c

+2 −2
Original line number Diff line number Diff line
@@ -645,6 +645,8 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) 
	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	int rc;



	qeth_l2_vnicc_set_defaults(card);



	if (gdev->dev.type == &qeth_generic_devtype) {

		rc = qeth_l2_create_device_attributes(&gdev->dev);

		if (rc)
@@ -652,8 +654,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) 
	}



	hash_init(card->mac_htable);

	card->info.hwtrap = 0;

	qeth_l2_vnicc_set_defaults(card);

	return 0;

}

drivers/s390/net/qeth_l3_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2260,7 +2260,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev) 
	}

	hash_init(card->ip_htable);

	hash_init(card->ip_mc_htable);

	card->info.hwtrap = 0;

	return 0;

}