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

Commit 26258cb3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-qeth-fixes' 



Julian Wiedmann says:

====================
s390/qeth: fixes 2019-09-26

please apply two qeth patches for -net. The first is a trivial cleanup
required for patch #2 by Jean, which fixes a potential endless loop.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d4ce5808 048a7f8b

drivers/s390/net/qeth_core_main.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static void qeth_put_reply(struct qeth_reply *reply) 
static void qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, int rc,

		struct qeth_card *card)

{

	char *ipa_name;

	const char *ipa_name;

	int com = cmd->hdr.command;

	ipa_name = qeth_get_ipa_cmd_name(com);

	if (rc)

drivers/s390/net/qeth_core_mpc.c

+16 −17
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ EXPORT_SYMBOL_GPL(IPA_PDU_HEADER); 


struct ipa_rc_msg {

	enum qeth_ipa_return_codes rc;

	char *msg;

	const char *msg;

};



static struct ipa_rc_msg qeth_ipa_rc_msg[] = {

static const struct ipa_rc_msg qeth_ipa_rc_msg[] = {

	{IPA_RC_SUCCESS,		"success"},

	{IPA_RC_NOTSUPP,		"Command not supported"},

	{IPA_RC_IP_TABLE_FULL,		"Add Addr IP Table Full - ipv6"},
@@ -219,23 +219,23 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = { 






char *qeth_get_ipa_msg(enum qeth_ipa_return_codes rc)

const char *qeth_get_ipa_msg(enum qeth_ipa_return_codes rc)

{

	int x = 0;

	qeth_ipa_rc_msg[sizeof(qeth_ipa_rc_msg) /

			sizeof(struct ipa_rc_msg) - 1].rc = rc;

	while (qeth_ipa_rc_msg[x].rc != rc)

		x++;

	int x;



	for (x = 0; x < ARRAY_SIZE(qeth_ipa_rc_msg) - 1; x++)

		if (qeth_ipa_rc_msg[x].rc == rc)

			return qeth_ipa_rc_msg[x].msg;

	return qeth_ipa_rc_msg[x].msg;

}





struct ipa_cmd_names {

	enum qeth_ipa_cmds cmd;

	char *name;

	const char *name;

};



static struct ipa_cmd_names qeth_ipa_cmd_names[] = {

static const struct ipa_cmd_names qeth_ipa_cmd_names[] = {

	{IPA_CMD_STARTLAN,	"startlan"},

	{IPA_CMD_STOPLAN,	"stoplan"},

	{IPA_CMD_SETVMAC,	"setvmac"},
@@ -267,13 +267,12 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = { 
	{IPA_CMD_UNKNOWN,	"unknown"},

};



char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd)

const char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd)

{

	int x = 0;

	qeth_ipa_cmd_names[

		sizeof(qeth_ipa_cmd_names) /

			sizeof(struct ipa_cmd_names)-1].cmd = cmd;

	while (qeth_ipa_cmd_names[x].cmd != cmd)

		x++;

	int x;



	for (x = 0; x < ARRAY_SIZE(qeth_ipa_cmd_names) - 1; x++)

		if (qeth_ipa_cmd_names[x].cmd == cmd)

			return qeth_ipa_cmd_names[x].name;

	return qeth_ipa_cmd_names[x].name;

}

drivers/s390/net/qeth_core_mpc.h

+2 −2
Original line number Diff line number Diff line
@@ -797,8 +797,8 @@ enum qeth_ipa_arp_return_codes { 
	QETH_IPA_ARP_RC_Q_NO_DATA    = 0x0008,

};



extern char *qeth_get_ipa_msg(enum qeth_ipa_return_codes rc);

extern char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd);

extern const char *qeth_get_ipa_msg(enum qeth_ipa_return_codes rc);

extern const char *qeth_get_ipa_cmd_name(enum qeth_ipa_cmds cmd);



#define QETH_SETASS_BASE_LEN (sizeof(struct qeth_ipacmd_hdr) + \

			       sizeof(struct qeth_ipacmd_setassparms_hdr))