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

Commit 73657a3e authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: extract helper for MPC protocol type 



Just a little code deduplication.

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

drivers/s390/net/qeth_core.h

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ void qeth_tx_timeout(struct net_device *); 
void qeth_prepare_control_data(struct qeth_card *, int,

				struct qeth_cmd_buffer *);

void qeth_release_buffer(struct qeth_channel *, struct qeth_cmd_buffer *);

void qeth_prepare_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, char);

void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob);

struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);

int qeth_query_switch_attributes(struct qeth_card *card,

				  struct qeth_switch_info *sw_info);

drivers/s390/net/qeth_core_main.c

+13 −22
Original line number Diff line number Diff line
@@ -2367,12 +2367,19 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply, 
	return 0;

}



static u8 qeth_mpc_select_prot_type(struct qeth_card *card)

{

	if (IS_OSN(card))

		return QETH_PROT_OSN2;

	return (card->options.layer2 == 1) ? QETH_PROT_LAYER2 : QETH_PROT_TCPIP;

}



static int qeth_ulp_enable(struct qeth_card *card)

{

	int rc;

	char prot_type;

	u8 prot_type = qeth_mpc_select_prot_type(card);

	struct qeth_cmd_buffer *iob;

	u16 max_mtu;

	int rc;



	/*FIXME: trace view callbacks*/

	QETH_DBF_TEXT(SETUP, 2, "ulpenabl");
@@ -2381,14 +2388,6 @@ static int qeth_ulp_enable(struct qeth_card *card) 
	memcpy(iob->data, ULP_ENABLE, ULP_ENABLE_SIZE);



	*(QETH_ULP_ENABLE_LINKNUM(iob->data)) = (u8) card->dev->dev_port;

	if (card->options.layer2)

		if (card->info.type == QETH_CARD_TYPE_OSN)

			prot_type = QETH_PROT_OSN2;

		else

			prot_type = QETH_PROT_LAYER2;

	else

		prot_type = QETH_PROT_TCPIP;



	memcpy(QETH_ULP_ENABLE_PROT_TYPE(iob->data), &prot_type, 1);

	memcpy(QETH_ULP_ENABLE_DEST_ADDR(iob->data),

	       &card->token.cm_connection_r, QETH_MPC_TOKEN_LENGTH);
@@ -2939,9 +2938,10 @@ struct qeth_cmd_buffer *qeth_get_ipacmd_buffer(struct qeth_card *card, 
}

EXPORT_SYMBOL_GPL(qeth_get_ipacmd_buffer);



void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,

		char prot_type)

void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob)

{

	u8 prot_type = qeth_mpc_select_prot_type(card);



	memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE);

	memcpy(QETH_IPA_CMD_PROT_TYPE(iob->data), &prot_type, 1);

	memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data),
@@ -2961,18 +2961,9 @@ int qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob, 
		void *reply_param)

{

	int rc;

	char prot_type;



	QETH_CARD_TEXT(card, 4, "sendipa");



	if (card->options.layer2)

		if (card->info.type == QETH_CARD_TYPE_OSN)

			prot_type = QETH_PROT_OSN2;

		else

			prot_type = QETH_PROT_LAYER2;

	else

		prot_type = QETH_PROT_TCPIP;

	qeth_prepare_ipa_cmd(card, iob, prot_type);

	qeth_prepare_ipa_cmd(card, iob);

	rc = qeth_send_control_data(card, IPA_CMD_LENGTH,

						iob, reply_cb, reply_param);

	if (rc == -ETIME) {

drivers/s390/net/qeth_l2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ static int qeth_osn_send_ipa_cmd(struct qeth_card *card, 


	QETH_CARD_TEXT(card, 4, "osndipa");



	qeth_prepare_ipa_cmd(card, iob, QETH_PROT_OSN2);

	qeth_prepare_ipa_cmd(card, iob);

	s1 = (u16)(IPA_PDU_HEADER_SIZE + data_len);

	s2 = (u16)data_len;

	memcpy(QETH_IPA_PDU_LEN_TOTAL(iob->data), &s1, 2);