Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 28 insertions, 52 deletions

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index f4f3ca1393b2..6a801dc3bf8e 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
 #include <linux/ip.h>
@@ -486,22 +487,14 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                 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]);
+                                "MAC address %pM already exists\n",
+                                card->dev->dev_addr);
                         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]);
+                                "MAC address %pM is not authorized\n",
+                                card->dev->dev_addr);
                         break;
                 default:
                         break;
@@ -512,12 +505,8 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                 memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,
                        OSA_ADDR_LEN);
                 dev_info(&card->gdev->dev,
-                        "MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-                        "successfully registered on device %s\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],
-                        card->dev->name);
+                        "MAC address %pM successfully registered on device %s\n",
+                        card->dev->dev_addr, card->dev->name);
         }
         return 0;
 }
@@ -634,7 +623,7 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
         for (dm = dev->mc_list; dm; dm = dm->next)
                 qeth_l2_add_mc(card, dm->da_addr, 0);
 
-        list_for_each_entry(ha, &dev->uc.list, list)
+        netdev_for_each_uc_addr(ha, dev)
                 qeth_l2_add_mc(card, ha->addr, 1);
 
         spin_unlock_bh(&card->mclock);
@@ -781,7 +770,8 @@ static void qeth_l2_qdio_input_handler(struct ccw_device *ccwdev,
                 index = i % QDIO_MAX_BUFFERS_PER_Q;
                 buffer = &card->qdio.in_q->bufs[index];
                 if (!(qdio_err &&
-                      qeth_check_qdio_errors(buffer->buffer, qdio_err, "qinerr")))
+                      qeth_check_qdio_errors(card, buffer->buffer, qdio_err,
+                                             "qinerr")))
                         qeth_l2_process_inbound_buffer(card, buffer, index);
                 /* clear buffer and give back to hardware */
                 qeth_put_buffer_pool_entry(card, buffer->pool_entry);
@@ -866,7 +856,7 @@ static const struct ethtool_ops qeth_l2_ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_strings = qeth_core_get_strings,
         .get_ethtool_stats = qeth_core_get_ethtool_stats,
-        .get_stats_count = qeth_core_get_stats_count,
+        .get_sset_count = qeth_core_get_sset_count,
         .get_drvinfo = qeth_core_get_drvinfo,
         .get_settings = qeth_core_ethtool_get_settings,
 };
@@ -874,7 +864,7 @@ static const struct ethtool_ops qeth_l2_ethtool_ops = {
 static const struct ethtool_ops qeth_l2_osn_ops = {
         .get_strings = qeth_core_get_strings,
         .get_ethtool_stats = qeth_core_get_ethtool_stats,
-        .get_stats_count = qeth_core_get_stats_count,
+        .get_sset_count = qeth_core_get_sset_count,
         .get_drvinfo = qeth_core_get_drvinfo,
 };
 
@@ -938,32 +928,18 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         QETH_DBF_TEXT(SETUP, 2, "setonlin");
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
-        qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
         recover_flag = card->state;
-        rc = ccw_device_set_online(CARD_RDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-        rc = ccw_device_set_online(CARD_WDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-        rc = ccw_device_set_online(CARD_DDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-                return -EIO;
-        }
-
         rc = qeth_core_hardsetup_card(card);
         if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);
+                rc = -ENODEV;
                 goto out_remove;
         }
 
-        if (!card->dev && qeth_l2_setup_netdev(card))
+        if (!card->dev && qeth_l2_setup_netdev(card)) {
+                rc = -ENODEV;
                 goto out_remove;
+        }
 
         if (card->info.type != QETH_CARD_TYPE_OSN)
                 qeth_l2_send_setmac(card, &card->dev->dev_addr[0]);
@@ -983,12 +959,14 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                         card->lan_online = 0;
                         return 0;
                 }
+                rc = -ENODEV;
                 goto out_remove;
         } else
                 card->lan_online = 1;
 
         if (card->info.type != QETH_CARD_TYPE_OSN) {
-                qeth_set_large_send(card, card->options.large_send);
+                /* configure isolation level */
+                qeth_set_access_ctrl_online(card);
                 qeth_l2_process_vlans(card, 0);
         }
 
@@ -997,6 +975,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         rc = qeth_init_qdio_queues(card);
         if (rc) {
                 QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
+                rc = -ENODEV;
                 goto out_remove;
         }
         card->state = CARD_STATE_SOFTSETUP;
@@ -1018,6 +997,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         /* let user_space know that device is online */
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
         return 0;
+
 out_remove:
         card->use_hard_stop = 1;
         qeth_l2_stop_card(card, 0);
@@ -1028,7 +1008,7 @@ out_remove:
                 card->state = CARD_STATE_RECOVER;
         else
                 card->state = CARD_STATE_DOWN;
-        return -ENODEV;
+        return rc;
 }
 
 static int qeth_l2_set_online(struct ccwgroup_device *gdev)
@@ -1092,11 +1072,9 @@ static int qeth_l2_recover(void *ptr)
                 dev_info(&card->gdev->dev,
                         "Device successfully recovered!\n");
         else {
-                if (card->dev) {
-                        rtnl_lock();
-                        dev_close(card->dev);
-                        rtnl_unlock();
-                }
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
                 dev_warn(&card->gdev->dev, "The qeth device driver "
                         "failed to recover an error on the device\n");
         }
@@ -1150,11 +1128,9 @@ static int qeth_l2_pm_resume(struct ccwgroup_device *gdev)
         if (card->state == CARD_STATE_RECOVER) {
                 rc = __qeth_l2_set_online(card->gdev, 1);
                 if (rc) {
-                        if (card->dev) {
-                                rtnl_lock();
-                                dev_close(card->dev);
-                                rtnl_unlock();
-                        }
+                        rtnl_lock();
+                        dev_close(card->dev);
+                        rtnl_unlock();
                 }
         } else
                 rc = __qeth_l2_set_online(card->gdev, 0);