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

Commit 0f5623c9 authored by Ursula Braun's avatar Ursula Braun Committed by Jeff Garzik
Browse files

qeth: remove non-recover-thread checkings 



IP-threads have been removed from the qeth driver. Only the
recover-thread is left over. This makes checkings for
non-recover threads superfluous.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 8b5f12d0

drivers/s390/net/qeth_l2_main.c

+1 −13
Original line number Diff line number Diff line
@@ -373,8 +373,6 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode) 
	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	qeth_set_allowed_threads(card, 0, 1);

	if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))

		return -ERESTARTSYS;

	if (card->read.state == CH_STATE_UP &&

	    card->write.state == CH_STATE_UP &&

	    (card->state == CARD_STATE_UP)) {
@@ -975,12 +973,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);

	if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {

		PRINT_WARN("set_online of card %s interrupted by user!\n",

			   CARD_BUS_ID(card));

		return -ERESTARTSYS;

	}



	recover_flag = card->state;

	rc = ccw_device_set_online(CARD_RDEV(card));

	if (rc) {
@@ -1091,11 +1083,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev, 
	if (card->dev && netif_carrier_ok(card->dev))

		netif_carrier_off(card->dev);

	recover_flag = card->state;

	if (qeth_l2_stop_card(card, recovery_mode) == -ERESTARTSYS) {

		PRINT_WARN("Stopping card %s interrupted by user!\n",

			   CARD_BUS_ID(card));

		return -ERESTARTSYS;

	}

	qeth_l2_stop_card(card, recovery_mode);

	rc  = ccw_device_set_offline(CARD_DDEV(card));

	rc2 = ccw_device_set_offline(CARD_WDEV(card));

	rc3 = ccw_device_set_offline(CARD_RDEV(card));

drivers/s390/net/qeth_l3_main.c

+1 −12
Original line number Diff line number Diff line
@@ -2064,8 +2064,6 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode) 
	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	qeth_set_allowed_threads(card, 0, 1);

	if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))

		return -ERESTARTSYS;

	if (card->read.state == CH_STATE_UP &&

	    card->write.state == CH_STATE_UP &&

	    (card->state == CARD_STATE_UP)) {
@@ -3049,11 +3047,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);

	if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {

		PRINT_WARN("set_online of card %s interrupted by user!\n",

			   CARD_BUS_ID(card));

		return -ERESTARTSYS;

	}



	recover_flag = card->state;

	rc = ccw_device_set_online(CARD_RDEV(card));
@@ -3170,11 +3163,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev, 
	if (card->dev && netif_carrier_ok(card->dev))

		netif_carrier_off(card->dev);

	recover_flag = card->state;

	if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {

		PRINT_WARN("Stopping card %s interrupted by user!\n",

			   CARD_BUS_ID(card));

		return -ERESTARTSYS;

	}

	qeth_l3_stop_card(card, recovery_mode);

	rc  = ccw_device_set_offline(CARD_DDEV(card));

	rc2 = ccw_device_set_offline(CARD_WDEV(card));

	rc3 = ccw_device_set_offline(CARD_RDEV(card));