diff options
Diffstat (limited to 'drivers/s390/net/qeth_l2_main.c')
-rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
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) |