s390/qeth: use __ipa_cmd() for casting an IPA cmd buffer (ff5caa7a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/s390/net/qeth_core_main.c

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -2951,12 +2951,10 @@ struct qeth_cmd_buffer qeth_get_ipacmd_buffer(struct qeth_card card,
	enum qeth_ipa_cmds ipacmd, enum qeth_prot_versions prot)		enum qeth_ipa_cmds ipacmd, enum qeth_prot_versions prot)
	{		{
	struct qeth_cmd_buffer *iob;		struct qeth_cmd_buffer *iob;
	struct qeth_ipa_cmd *cmd;

	iob = qeth_get_buffer(&card->write);		iob = qeth_get_buffer(&card->write);
	if (iob) {		if (iob) {
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		qeth_fill_ipacmd_header(card, __ipa_cmd(iob), ipacmd, prot);
	qeth_fill_ipacmd_header(card, cmd, ipacmd, prot);
	} else {		} else {
	dev_warn(&card->gdev->dev,		dev_warn(&card->gdev->dev,
	"The qeth driver ran out of channel command buffers\n");		"The qeth driver ran out of channel command buffers\n");
	@@ -3067,7 +3065,7 @@ static struct qeth_cmd_buffer qeth_get_adapter_cmd(struct qeth_card card,
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETADAPTERPARMS,		iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETADAPTERPARMS,
	QETH_PROT_IPV4);		QETH_PROT_IPV4);
	if (iob) {		if (iob) {
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setadapterparms.hdr.cmdlength = cmdlen;		cmd->data.setadapterparms.hdr.cmdlength = cmdlen;
	cmd->data.setadapterparms.hdr.command_code = command;		cmd->data.setadapterparms.hdr.command_code = command;
	cmd->data.setadapterparms.hdr.used_total = 1;		cmd->data.setadapterparms.hdr.used_total = 1;
	@@ -3209,7 +3207,7 @@ static int qeth_query_setdiagass(struct qeth_card *card)
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);		iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.diagass.subcmd_len = 16;		cmd->data.diagass.subcmd_len = 16;
	cmd->data.diagass.subcmd = QETH_DIAGS_CMD_QUERY;		cmd->data.diagass.subcmd = QETH_DIAGS_CMD_QUERY;
	return qeth_send_ipa_cmd(card, iob, qeth_query_setdiagass_cb, NULL);		return qeth_send_ipa_cmd(card, iob, qeth_query_setdiagass_cb, NULL);
	@@ -3262,7 +3260,7 @@ int qeth_hw_trap(struct qeth_card *card, enum qeth_diags_trap_action action)
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);		iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.diagass.subcmd_len = 80;		cmd->data.diagass.subcmd_len = 80;
	cmd->data.diagass.subcmd = QETH_DIAGS_CMD_TRAP;		cmd->data.diagass.subcmd = QETH_DIAGS_CMD_TRAP;
	cmd->data.diagass.type = 1;		cmd->data.diagass.type = 1;
	@@ -4240,7 +4238,7 @@ void qeth_setadp_promisc_mode(struct qeth_card *card)
	sizeof(struct qeth_ipacmd_setadpparms_hdr) + 8);		sizeof(struct qeth_ipacmd_setadpparms_hdr) + 8);
	if (!iob)		if (!iob)
	return;		return;
	cmd = (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setadapterparms.data.mode = mode;		cmd->data.setadapterparms.data.mode = mode;
	qeth_send_ipa_cmd(card, iob, qeth_setadp_promisc_mode_cb, NULL);		qeth_send_ipa_cmd(card, iob, qeth_setadp_promisc_mode_cb, NULL);
	}		}
	@@ -4307,7 +4305,7 @@ int qeth_setadpparms_change_macaddr(struct qeth_card *card)
	sizeof(struct qeth_change_addr));		sizeof(struct qeth_change_addr));
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setadapterparms.data.change_addr.cmd = CHANGE_ADDR_READ_MAC;		cmd->data.setadapterparms.data.change_addr.cmd = CHANGE_ADDR_READ_MAC;
	cmd->data.setadapterparms.data.change_addr.addr_size = ETH_ALEN;		cmd->data.setadapterparms.data.change_addr.addr_size = ETH_ALEN;
	ether_addr_copy(cmd->data.setadapterparms.data.change_addr.addr,		ether_addr_copy(cmd->data.setadapterparms.data.change_addr.addr,
	@@ -4422,7 +4420,7 @@ static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,
	sizeof(struct qeth_set_access_ctrl));		sizeof(struct qeth_set_access_ctrl));
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;		access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;
	access_ctrl_req->subcmd_code = isolation;		access_ctrl_req->subcmd_code = isolation;

	@@ -4668,7 +4666,7 @@ static int qeth_snmp_command(struct qeth_card card, char __user udata)
	rc = -ENOMEM;		rc = -ENOMEM;
	goto out;		goto out;
	}		}
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	memcpy(&cmd->data.setadapterparms.data.snmp, &ureq->cmd, req_len);		memcpy(&cmd->data.setadapterparms.data.snmp, &ureq->cmd, req_len);
	rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len,		rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len,
	qeth_snmp_command_cb, (void *)&qinfo);		qeth_snmp_command_cb, (void *)&qinfo);
	@@ -4753,7 +4751,7 @@ static int qeth_query_oat_command(struct qeth_card card, char __user udata)
	rc = -ENOMEM;		rc = -ENOMEM;
	goto out_free;		goto out_free;
	}		}
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	oat_req = &cmd->data.setadapterparms.data.query_oat;		oat_req = &cmd->data.setadapterparms.data.query_oat;
	oat_req->subcmd_code = oat_data.command;		oat_req->subcmd_code = oat_data.command;

	@@ -5494,7 +5492,7 @@ struct qeth_cmd_buffer qeth_get_setassparms_cmd(struct qeth_card card,
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETASSPARMS, prot);		iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETASSPARMS, prot);

	if (iob) {		if (iob) {
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setassparms.hdr.assist_no = ipa_func;		cmd->data.setassparms.hdr.assist_no = ipa_func;
	cmd->data.setassparms.hdr.length = 8 + len;		cmd->data.setassparms.hdr.length = 8 + len;
	cmd->data.setassparms.hdr.command_code = cmd_code;		cmd->data.setassparms.hdr.command_code = cmd_code;
	@@ -5517,7 +5515,7 @@ int qeth_send_setassparms(struct qeth_card *card,

	QETH_CARD_TEXT(card, 4, "sendassp");		QETH_CARD_TEXT(card, 4, "sendassp");

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	if (len <= sizeof(__u32))		if (len <= sizeof(__u32))
	cmd->data.setassparms.data.flags_32bit = (__u32) data;		cmd->data.setassparms.data.flags_32bit = (__u32) data;
	else /* (len > sizeof(__u32)) */		else /* (len > sizeof(__u32)) */

drivers/s390/net/qeth_l2_main.c

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -108,7 +108,7 @@ static int qeth_l2_send_setdelmac(struct qeth_card card, __u8 mac,
	iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);		iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setdelmac.mac_length = ETH_ALEN;		cmd->data.setdelmac.mac_length = ETH_ALEN;
	ether_addr_copy(cmd->data.setdelmac.mac, mac);		ether_addr_copy(cmd->data.setdelmac.mac, mac);
	return qeth_setdelmac_makerc(card, qeth_send_ipa_cmd(card, iob,		return qeth_setdelmac_makerc(card, qeth_send_ipa_cmd(card, iob,
	@@ -305,7 +305,7 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i,
	iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);		iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setdelvlan.vlan_id = i;		cmd->data.setdelvlan.vlan_id = i;
	return qeth_setdelvlan_makerc(card, qeth_send_ipa_cmd(card, iob,		return qeth_setdelvlan_makerc(card, qeth_send_ipa_cmd(card, iob,
	qeth_l2_send_setdelvlan_cb, NULL));		qeth_l2_send_setdelvlan_cb, NULL));
	@@ -1374,7 +1374,6 @@ int qeth_osn_assist(struct net_device dev, void data, int data_len)
	{		{
	struct qeth_cmd_buffer *iob;		struct qeth_cmd_buffer *iob;
	struct qeth_card *card;		struct qeth_card *card;
	int rc;

	if (!dev)		if (!dev)
	return -ENODEV;		return -ENODEV;
	@@ -1385,9 +1384,8 @@ int qeth_osn_assist(struct net_device dev, void data, int data_len)
	if (!qeth_card_hw_is_reachable(card))		if (!qeth_card_hw_is_reachable(card))
	return -ENODEV;		return -ENODEV;
	iob = qeth_wait_for_buffer(&card->write);		iob = qeth_wait_for_buffer(&card->write);
	memcpy(iob->data+IPA_PDU_HEADER_SIZE, data, data_len);		memcpy(__ipa_cmd(iob), data, data_len);
	rc = qeth_osn_send_ipa_cmd(card, iob, data_len);		return qeth_osn_send_ipa_cmd(card, iob, data_len);
	return rc;
	}		}
	EXPORT_SYMBOL(qeth_osn_assist);		EXPORT_SYMBOL(qeth_osn_assist);

	@@ -1764,7 +1762,7 @@ static struct qeth_cmd_buffer qeth_sbp_build_cmd(struct qeth_card card,
	iob = qeth_get_ipacmd_buffer(card, ipa_cmd, 0);		iob = qeth_get_ipacmd_buffer(card, ipa_cmd, 0);
	if (!iob)		if (!iob)
	return iob;		return iob;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.sbp.hdr.cmdlength = sizeof(struct qeth_ipacmd_sbp_hdr) +		cmd->data.sbp.hdr.cmdlength = sizeof(struct qeth_ipacmd_sbp_hdr) +
	cmd_length;		cmd_length;
	cmd->data.sbp.hdr.command_code = sbp_cmd;		cmd->data.sbp.hdr.command_code = sbp_cmd;
	@@ -2129,7 +2127,7 @@ static int qeth_l2_vnicc_request(struct qeth_card *card,
	return -ENOMEM;		return -ENOMEM;

	/* create header for request */		/* create header for request */
	cmd = (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	req = &cmd->data.vnicc;		req = &cmd->data.vnicc;

	/* create sub command header for request */		/* create sub command header for request */

drivers/s390/net/qeth_l3_main.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -352,7 +352,7 @@ static int qeth_l3_send_setdelmc(struct qeth_card *card,
	iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);		iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	ether_addr_copy(cmd->data.setdelipm.mac, addr->mac);		ether_addr_copy(cmd->data.setdelipm.mac, addr->mac);
	if (addr->proto == QETH_PROT_IPV6)		if (addr->proto == QETH_PROT_IPV6)
	memcpy(cmd->data.setdelipm.ip6, &addr->u.a6.addr,		memcpy(cmd->data.setdelipm.ip6, &addr->u.a6.addr,
	@@ -393,7 +393,7 @@ static int qeth_l3_send_setdelip(struct qeth_card *card,
	iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);		iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	if (addr->proto == QETH_PROT_IPV6) {		if (addr->proto == QETH_PROT_IPV6) {
	memcpy(cmd->data.setdelip6.ip_addr, &addr->u.a6.addr,		memcpy(cmd->data.setdelip6.ip_addr, &addr->u.a6.addr,
	sizeof(struct in6_addr));		sizeof(struct in6_addr));
	@@ -423,7 +423,7 @@ static int qeth_l3_send_setrouting(struct qeth_card *card,
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETRTG, prot);		iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETRTG, prot);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setrtg.type = (type);		cmd->data.setrtg.type = (type);
	rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);		rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);

	@@ -1072,7 +1072,7 @@ static int qeth_l3_iqd_read_initial_mac(struct qeth_card *card)
	QETH_PROT_IPV6);		QETH_PROT_IPV6);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	((__u16 ) &cmd->data.create_destroy_addr.unique_id[6]) =		((__u16 ) &cmd->data.create_destroy_addr.unique_id[6]) =
	card->info.unique_id;		card->info.unique_id;

	@@ -1117,7 +1117,7 @@ static int qeth_l3_get_unique_id(struct qeth_card *card)
	QETH_PROT_IPV6);		QETH_PROT_IPV6);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	((__u16 ) &cmd->data.create_destroy_addr.unique_id[6]) =		((__u16 ) &cmd->data.create_destroy_addr.unique_id[6]) =
	card->info.unique_id;		card->info.unique_id;

	@@ -1193,7 +1193,7 @@ qeth_diags_trace(struct qeth_card *card, enum qeth_diags_trace_cmds diags_cmd)
	iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);		iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.diagass.subcmd_len = 16;		cmd->data.diagass.subcmd_len = 16;
	cmd->data.diagass.subcmd = QETH_DIAGS_CMD_TRACE;		cmd->data.diagass.subcmd = QETH_DIAGS_CMD_TRACE;
	cmd->data.diagass.type = QETH_DIAGS_TYPE_HIPERSOCKET;		cmd->data.diagass.type = QETH_DIAGS_TYPE_HIPERSOCKET;
	@@ -2004,7 +2004,7 @@ static int qeth_l3_query_arp_cache_info(struct qeth_card *card,
	prot);		prot);
	if (!iob)		if (!iob)
	return -ENOMEM;		return -ENOMEM;
	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);		cmd = __ipa_cmd(iob);
	cmd->data.setassparms.data.query_arp.request_bits = 0x000F;		cmd->data.setassparms.data.query_arp.request_bits = 0x000F;
	cmd->data.setassparms.data.query_arp.reply_bits = 0;		cmd->data.setassparms.data.query_arp.reply_bits = 0;
	cmd->data.setassparms.data.query_arp.no_entries = 0;		cmd->data.setassparms.data.query_arp.no_entries = 0;