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

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

qeth: meaningful return code for set_mac_address 



Setting an invalid mac-address for a qeth layer2 device returns
with a strange error code:
# ip link set hsi1 address 00:00:00:00:00:01
   RTNETLINK answers: Unknown error 18446744073709486085
Problem is caused by wrong usage of the return_code field within
structure qeth_ipa_cmd.
With this patch the ip command above returns
   SIOCSIFHWADDR: Invalid argument

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 205a8b64

drivers/s390/net/qeth_core_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2945,8 +2945,8 @@ static int qeth_query_ipassists_cb(struct qeth_card *card, 
		card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled;

	}

	QETH_DBF_TEXT(SETUP, 2, "suppenbl");

	QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_supported);

	QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_enabled);

	QETH_DBF_TEXT_(SETUP, 2, "%08x", (__u32)cmd->hdr.ipa_supported);

	QETH_DBF_TEXT_(SETUP, 2, "%08x", (__u32)cmd->hdr.ipa_enabled);

	return 0;

}
@@ -4322,7 +4322,7 @@ static int qeth_snmp_command_cb(struct qeth_card *card, 
	/* check if there is enough room in userspace */

	if ((qinfo->udata_len - qinfo->udata_offset) < data_len) {

		QETH_CARD_TEXT_(card, 4, "scer3%i", -ENOMEM);

		cmd->hdr.return_code = -ENOMEM;

		cmd->hdr.return_code = IPA_RC_ENOMEM;

		return 0;

	}

	QETH_CARD_TEXT_(card, 4, "snore%i",

drivers/s390/net/qeth_core_mpc.c

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = { 
	{IPA_RC_MC_ADDR_ALREADY_DEFINED, "Multicast address already defined"},

	{IPA_RC_LAN_OFFLINE,		"STRTLAN_LAN_DISABLED - LAN offline"},

	{IPA_RC_INVALID_IP_VERSION2,	"Invalid IP version"},

	{IPA_RC_ENOMEM,			"Memory problem"},

	{IPA_RC_FFFF,			"Unknown Error"}

};

drivers/s390/net/qeth_core_mpc.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ enum qeth_ipa_return_codes { 
	IPA_RC_MC_ADDR_ALREADY_DEFINED	= 0xe013,

	IPA_RC_LAN_OFFLINE		= 0xe080,

	IPA_RC_INVALID_IP_VERSION2	= 0xf001,

	IPA_RC_ENOMEM			= 0xfffe,

	IPA_RC_FFFF			= 0xffff

};

/* for DELIP */

drivers/s390/net/qeth_l2_main.c

+1 −3
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card, 
		default:

			break;

		}

		cmd->hdr.return_code = -EIO;

	} else {

		card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;

		memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,
@@ -605,7 +604,6 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card, 
	cmd = (struct qeth_ipa_cmd *) data;

	if (cmd->hdr.return_code) {

		QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code);

		cmd->hdr.return_code = -EIO;

		return 0;

	}

	card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
@@ -682,7 +680,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 
	rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]);

	if (!rc)

		rc = qeth_l2_send_setmac(card, addr->sa_data);

	return rc;

	return rc ? -EINVAL : 0;

}



static void qeth_l2_set_multicast_list(struct net_device *dev)

drivers/s390/net/qeth_l3_main.c

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


		if ((qinfo->udata_len - qinfo->udata_offset) < esize) {

			QETH_CARD_TEXT_(card, 4, "qaer3%i", -ENOMEM);

			cmd->hdr.return_code = -ENOMEM;

			cmd->hdr.return_code = IPA_RC_ENOMEM;

			goto out_error;

		}