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

Commit bbb822a8 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

qeth: return zero from reply callback functions 



Reply callback functions in qeth should return zero if command
response consists of one part only, otherwise qeth continues
waiting for further parts of the command response.

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 avatarDavid S. Miller <davem@davemloft.net>
parent e48d24a6

drivers/s390/net/qeth_core_main.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -1996,7 +1996,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply, 
		QETH_DBF_TEXT(SETUP, 2, "olmlimit");

		QETH_DBF_TEXT(SETUP, 2, "olmlimit");

		dev_err(&card->gdev->dev, "A connection could not be "

		dev_err(&card->gdev->dev, "A connection could not be "

			"established because of an OLM limit\n");

			"established because of an OLM limit\n");

		rc = -EMLINK;

		iob->rc = -EMLINK;

	}

	}

	QETH_DBF_TEXT_(SETUP, 2, "  rc%d", iob->rc);

	QETH_DBF_TEXT_(SETUP, 2, "  rc%d", iob->rc);

	return rc;

	return rc;
@@ -3423,7 +3423,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 
{

{

	struct qeth_ipa_cmd *cmd;

	struct qeth_ipa_cmd *cmd;

	struct qeth_set_access_ctrl *access_ctrl_req;

	struct qeth_set_access_ctrl *access_ctrl_req;

	int rc;





	QETH_CARD_TEXT(card, 4, "setaccb");

	QETH_CARD_TEXT(card, 4, "setaccb");
@@ -3450,7 +3449,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 
			card->gdev->dev.kobj.name,

			card->gdev->dev.kobj.name,

			access_ctrl_req->subcmd_code,

			access_ctrl_req->subcmd_code,

			cmd->data.setadapterparms.hdr.return_code);

			cmd->data.setadapterparms.hdr.return_code);

		rc = 0;

		break;

		break;

	}

	}

	case SET_ACCESS_CTRL_RC_NOT_SUPPORTED:

	case SET_ACCESS_CTRL_RC_NOT_SUPPORTED:
@@ -3464,7 +3462,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 




		/* ensure isolation mode is "none" */

		/* ensure isolation mode is "none" */

		card->options.isolation = ISOLATION_MODE_NONE;

		card->options.isolation = ISOLATION_MODE_NONE;

		rc = -EOPNOTSUPP;

		break;

		break;

	}

	}

	case SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER:

	case SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER:
@@ -3479,7 +3476,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 




		/* ensure isolation mode is "none" */

		/* ensure isolation mode is "none" */

		card->options.isolation = ISOLATION_MODE_NONE;

		card->options.isolation = ISOLATION_MODE_NONE;

		rc = -EOPNOTSUPP;

		break;

		break;

	}

	}

	case SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF:

	case SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF:
@@ -3493,7 +3489,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 




		/* ensure isolation mode is "none" */

		/* ensure isolation mode is "none" */

		card->options.isolation = ISOLATION_MODE_NONE;

		card->options.isolation = ISOLATION_MODE_NONE;

		rc = -EPERM;

		break;

		break;

	}

	}

	default:

	default:
@@ -3507,12 +3502,11 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 




		/* ensure isolation mode is "none" */

		/* ensure isolation mode is "none" */

		card->options.isolation = ISOLATION_MODE_NONE;

		card->options.isolation = ISOLATION_MODE_NONE;

		rc = 0;

		break;

		break;

	}

	}

	}

	}

	qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);

	qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);

	return rc;

	return 0;

}

}





static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,

static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,