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: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index ef17d8366ce229917610a9dbb987bf9230e20d26..120955c66410faf8e4c8254baebba15895d38aa9 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -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",

diff --git a/drivers/s390/net/qeth_core_mpc.c b/drivers/s390/net/qeth_core_mpc.c
index ec24901c802c565231f27a9b369c3fb19950ca9b..7fab6544def66b02f9756fe67a6d0a7a529077b5 100644 (file)
--- a/drivers/s390/net/qeth_core_mpc.c
+++ b/drivers/s390/net/qeth_core_mpc.c
@@ -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"}
 };
 

diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h
index 578e19a2de6bae7f92f4f737a38d352b87986b3d..ff41e42004ac4e13c880f5e45e8cf95eb7342ad5 100644 (file)
--- a/drivers/s390/net/qeth_core_mpc.h
+++ b/drivers/s390/net/qeth_core_mpc.h
@@ -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 */

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index e5c9cf15e5c6b6983cf2a84a081fd28e5450cc42..0e7c29d1d7efc5991904a5d54f906a56086d244c 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -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)

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 73bf8889984b33b72e7842a7fa407ee708d5c4c4..f859216076867b805548085ee1ea86ae5d4103e8 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -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;
                }