qeth: support z/VM VSWITCH Port Isolation

[linux-block.git] / drivers / s390 / net / qeth_l2_main.c

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 172031baedc1aef4d44f4c03663612e56b76c646..9ca6bab7c9ba21d0128ab2789c0cf39bfdc6f401 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -130,7 +130,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
        cmd = (struct qeth_ipa_cmd *) data;
        mac = &cmd->data.setdelmac.mac[0];
        /* MAC already registered, needed in couple/uncouple case */
-       if (cmd->hdr.return_code == 0x2005) {
+       if (cmd->hdr.return_code ==  IPA_RC_L2_DUP_MAC) {
                QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
                          mac, QETH_CARD_IFNAME(card));
                cmd->hdr.return_code = 0;
@@ -502,6 +502,30 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
        if (cmd->hdr.return_code) {
                QETH_DBF_TEXT_(TRACE, 2, "L2er%x", cmd->hdr.return_code);
                card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
+               switch (cmd->hdr.return_code) {
+               case IPA_RC_L2_DUP_MAC:
+               case IPA_RC_L2_DUP_LAYER3_MAC:
+                       dev_warn(&card->gdev->dev,
+                               "MAC address "
+                               "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
+                               "already exists\n",
+                               card->dev->dev_addr[0], card->dev->dev_addr[1],
+                               card->dev->dev_addr[2], card->dev->dev_addr[3],
+                               card->dev->dev_addr[4], card->dev->dev_addr[5]);
+                       break;
+               case IPA_RC_L2_MAC_NOT_AUTH_BY_HYP:
+               case IPA_RC_L2_MAC_NOT_AUTH_BY_ADP:
+                       dev_warn(&card->gdev->dev,
+                               "MAC address "
+                               "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
+                               "is not authorized\n",
+                               card->dev->dev_addr[0], card->dev->dev_addr[1],
+                               card->dev->dev_addr[2], card->dev->dev_addr[3],
+                               card->dev->dev_addr[4], card->dev->dev_addr[5]);
+                       break;
+               default:
+                       break;
+               }
                cmd->hdr.return_code = -EIO;
        } else {
                card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
@@ -839,6 +863,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)
 {
        struct qeth_card *card = dev_get_drvdata(&cgdev->dev);
 
+       qeth_set_allowed_threads(card, 0, 1);
        wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
 
        if (cgdev->state == CCWGROUP_ONLINE) {
@@ -974,8 +999,9 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                        dev_warn(&card->gdev->dev,
                                "The LAN is offline\n");
                        card->lan_online = 0;
+                       return 0;
                }
-               return rc;
+               goto out_remove;
        } else
                card->lan_online = 1;