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

Commit addc5ee8 authored Jul 19, 2018 by Julian Wiedmann Committed by David S. Miller Jul 21, 2018

s390/qeth: remove redundant netif_carrier_ok() checks



netif_carrier_off() does its own checking.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 70551dc4

drivers/s390/net/qeth_core_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -653,7 +653,7 @@ static struct qeth_ipa_cmd qeth_check_ipa_data(struct qeth_card card,
	cmd->hdr.return_code, card);		cmd->hdr.return_code, card);
	}		}
	card->lan_online = 0;		card->lan_online = 0;
	if (card->dev && netif_carrier_ok(card->dev))		if (card->dev)
	netif_carrier_off(card->dev);		netif_carrier_off(card->dev);
	return NULL;		return NULL;
	case IPA_CMD_STARTLAN:		case IPA_CMD_STARTLAN:

drivers/s390/net/qeth_l2_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1163,7 +1163,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,
	QETH_DBF_TEXT(SETUP, 3, "setoffl");		QETH_DBF_TEXT(SETUP, 3, "setoffl");
	QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));		QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));

	if (card->dev && netif_carrier_ok(card->dev))		if (card->dev)
	netif_carrier_off(card->dev);		netif_carrier_off(card->dev);
	recover_flag = card->state;		recover_flag = card->state;
	if ((!recovery_mode && card->info.hwtrap) \|\| card->info.hwtrap == 2) {		if ((!recovery_mode && card->info.hwtrap) \|\| card->info.hwtrap == 2) {

drivers/s390/net/qeth_l3_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2773,7 +2773,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
	QETH_DBF_TEXT(SETUP, 3, "setoffl");		QETH_DBF_TEXT(SETUP, 3, "setoffl");
	QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));		QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));

	if (card->dev && netif_carrier_ok(card->dev))		if (card->dev)
	netif_carrier_off(card->dev);		netif_carrier_off(card->dev);
	recover_flag = card->state;		recover_flag = card->state;
	if ((!recovery_mode && card->info.hwtrap) \|\| card->info.hwtrap == 2) {		if ((!recovery_mode && card->info.hwtrap) \|\| card->info.hwtrap == 2) {