diff options
author | Ursula Braun <ursula.braun@de.ibm.com> | 2012-03-06 21:06:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-08 01:52:25 -0500 |
commit | e0a8114c034cf8012565c5d56dd90967023cc724 (patch) | |
tree | 3514956ac112db812fb9db1efa4d043e8f09dc19 /drivers/s390/net | |
parent | 205a8b649cf6c0a1e6e7512b65c72df480e2a883 (diff) |
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>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r-- | drivers/s390/net/qeth_core_main.c | 6 | ||||
-rw-r--r-- | drivers/s390/net/qeth_core_mpc.c | 1 | ||||
-rw-r--r-- | drivers/s390/net/qeth_core_mpc.h | 1 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 4 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index ef17d8366ce..120955c6641 100644 --- 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, | |||
2945 | card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled; | 2945 | card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled; |
2946 | } | 2946 | } |
2947 | QETH_DBF_TEXT(SETUP, 2, "suppenbl"); | 2947 | QETH_DBF_TEXT(SETUP, 2, "suppenbl"); |
2948 | QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_supported); | 2948 | QETH_DBF_TEXT_(SETUP, 2, "%08x", (__u32)cmd->hdr.ipa_supported); |
2949 | QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_enabled); | 2949 | QETH_DBF_TEXT_(SETUP, 2, "%08x", (__u32)cmd->hdr.ipa_enabled); |
2950 | return 0; | 2950 | return 0; |
2951 | } | 2951 | } |
2952 | 2952 | ||
@@ -4322,7 +4322,7 @@ static int qeth_snmp_command_cb(struct qeth_card *card, | |||
4322 | /* check if there is enough room in userspace */ | 4322 | /* check if there is enough room in userspace */ |
4323 | if ((qinfo->udata_len - qinfo->udata_offset) < data_len) { | 4323 | if ((qinfo->udata_len - qinfo->udata_offset) < data_len) { |
4324 | QETH_CARD_TEXT_(card, 4, "scer3%i", -ENOMEM); | 4324 | QETH_CARD_TEXT_(card, 4, "scer3%i", -ENOMEM); |
4325 | cmd->hdr.return_code = -ENOMEM; | 4325 | cmd->hdr.return_code = IPA_RC_ENOMEM; |
4326 | return 0; | 4326 | return 0; |
4327 | } | 4327 | } |
4328 | QETH_CARD_TEXT_(card, 4, "snore%i", | 4328 | 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 ec24901c802..7fab6544def 100644 --- 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[] = { | |||
207 | {IPA_RC_MC_ADDR_ALREADY_DEFINED, "Multicast address already defined"}, | 207 | {IPA_RC_MC_ADDR_ALREADY_DEFINED, "Multicast address already defined"}, |
208 | {IPA_RC_LAN_OFFLINE, "STRTLAN_LAN_DISABLED - LAN offline"}, | 208 | {IPA_RC_LAN_OFFLINE, "STRTLAN_LAN_DISABLED - LAN offline"}, |
209 | {IPA_RC_INVALID_IP_VERSION2, "Invalid IP version"}, | 209 | {IPA_RC_INVALID_IP_VERSION2, "Invalid IP version"}, |
210 | {IPA_RC_ENOMEM, "Memory problem"}, | ||
210 | {IPA_RC_FFFF, "Unknown Error"} | 211 | {IPA_RC_FFFF, "Unknown Error"} |
211 | }; | 212 | }; |
212 | 213 | ||
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h index 578e19a2de6..ff41e42004a 100644 --- 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 { | |||
190 | IPA_RC_MC_ADDR_ALREADY_DEFINED = 0xe013, | 190 | IPA_RC_MC_ADDR_ALREADY_DEFINED = 0xe013, |
191 | IPA_RC_LAN_OFFLINE = 0xe080, | 191 | IPA_RC_LAN_OFFLINE = 0xe080, |
192 | IPA_RC_INVALID_IP_VERSION2 = 0xf001, | 192 | IPA_RC_INVALID_IP_VERSION2 = 0xf001, |
193 | IPA_RC_ENOMEM = 0xfffe, | ||
193 | IPA_RC_FFFF = 0xffff | 194 | IPA_RC_FFFF = 0xffff |
194 | }; | 195 | }; |
195 | /* for DELIP */ | 196 | /* for DELIP */ |
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index e5c9cf15e5c..0e7c29d1d7e 100644 --- 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, | |||
576 | default: | 576 | default: |
577 | break; | 577 | break; |
578 | } | 578 | } |
579 | cmd->hdr.return_code = -EIO; | ||
580 | } else { | 579 | } else { |
581 | card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED; | 580 | card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED; |
582 | memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac, | 581 | memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac, |
@@ -605,7 +604,6 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card, | |||
605 | cmd = (struct qeth_ipa_cmd *) data; | 604 | cmd = (struct qeth_ipa_cmd *) data; |
606 | if (cmd->hdr.return_code) { | 605 | if (cmd->hdr.return_code) { |
607 | QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code); | 606 | QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code); |
608 | cmd->hdr.return_code = -EIO; | ||
609 | return 0; | 607 | return 0; |
610 | } | 608 | } |
611 | card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED; | 609 | 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) | |||
682 | rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]); | 680 | rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]); |
683 | if (!rc) | 681 | if (!rc) |
684 | rc = qeth_l2_send_setmac(card, addr->sa_data); | 682 | rc = qeth_l2_send_setmac(card, addr->sa_data); |
685 | return rc; | 683 | return rc ? -EINVAL : 0; |
686 | } | 684 | } |
687 | 685 | ||
688 | static void qeth_l2_set_multicast_list(struct net_device *dev) | 686 | 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 73bf8889984..f8592160768 100644 --- 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, | |||
2430 | 2430 | ||
2431 | if ((qinfo->udata_len - qinfo->udata_offset) < esize) { | 2431 | if ((qinfo->udata_len - qinfo->udata_offset) < esize) { |
2432 | QETH_CARD_TEXT_(card, 4, "qaer3%i", -ENOMEM); | 2432 | QETH_CARD_TEXT_(card, 4, "qaer3%i", -ENOMEM); |
2433 | cmd->hdr.return_code = -ENOMEM; | 2433 | cmd->hdr.return_code = IPA_RC_ENOMEM; |
2434 | goto out_error; | 2434 | goto out_error; |
2435 | } | 2435 | } |
2436 | 2436 | ||