Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1075 commits)
  myri10ge: update driver version number to 1.4.3-1.369
  r8169: add shutdown handler
  r8169: preliminary 8168d support
  r8169: support additional 8168cp chipset
  r8169: change default behavior for mildly identified 8168c chipsets
  r8169: add a new 8168cp flavor
  r8169: add a new 8168c flavor (bis)
  r8169: add a new 8168c flavor
  r8169: sync existing 8168 device hardware start sequences with vendor driver
  r8169: 8168b Tx performance tweak
  r8169: make room for more specific 8168 hardware start procedure
  r8169: shuffle some registers handling around (8168 operation only)
  r8169: new phy init parameters for the 8168b
  r8169: update phy init parameters
  r8169: wake up the PHY of the 8168
  af_key: fix SADB_X_SPDDELETE response
  ath9k: Fix return code when ath9k_hw_setpower() fails on reset
  ath9k: remove nasty FAIL macro from ath9k_hw_reset()
  gre: minor cleanups in netlink interface
  gre: fix copy and paste error
  ...

3 files changed, 17 insertions, 9 deletions

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 141b2bb7b3cf..7de410d5be4a 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -760,7 +760,7 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
                 if (sense[SENSE_COMMAND_REJECT_BYTE] &
                     SENSE_COMMAND_REJECT_FLAG) {
                         QETH_DBF_TEXT(TRACE, 2, "CMDREJi");
-                        return 0;
+                        return 1;
                 }
                 if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) {
                         QETH_DBF_TEXT(TRACE, 2, "AFFE");
@@ -884,6 +884,7 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
                 }
                 rc = qeth_get_problem(cdev, irb);
                 if (rc) {
+                        qeth_clear_ipacmd_list(card);
                         qeth_schedule_recovery(card);
                         goto out;
                 }
@@ -4147,6 +4148,7 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev)
         unsigned long flags;
         struct qeth_card *card = dev_get_drvdata(&gdev->dev);
 
+        QETH_DBF_TEXT(SETUP, 2, "removedv");
         if (card->discipline.ccwgdriver) {
                 card->discipline.ccwgdriver->remove(gdev);
                 qeth_core_free_discipline(card);
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 3ac3cc1e03cc..955ba7a31b90 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -395,7 +395,8 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
         }
         if (card->state == CARD_STATE_SOFTSETUP) {
                 qeth_l2_process_vlans(card, 1);
-                qeth_l2_del_all_mc(card);
+                if (!card->use_hard_stop)
+                        qeth_l2_del_all_mc(card);
                 qeth_clear_ipacmd_list(card);
                 card->state = CARD_STATE_HARDSETUP;
         }
@@ -559,7 +560,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
                         "device %s: x%x\n", CARD_BUS_ID(card), rc);
         }
 
-        if (card->info.guestlan) {
+        if ((card->info.type == QETH_CARD_TYPE_IQD) || 
+            (card->info.guestlan)) {
                 rc = qeth_setadpparms_change_macaddr(card);
                 if (rc) {
                         QETH_DBF_MESSAGE(2, "couldn't get MAC address on "
@@ -825,7 +827,6 @@ static int qeth_l2_open(struct net_device *dev)
         }
         card->data.state = CH_STATE_UP;
         card->state = CARD_STATE_UP;
-        card->dev->flags |= IFF_UP;
         netif_start_queue(dev);
 
         if (!card->lan_online && netif_carrier_ok(dev))
@@ -840,7 +841,6 @@ static int qeth_l2_stop(struct net_device *dev)
 
         QETH_DBF_TEXT(TRACE, 4, "qethstop");
         netif_tx_disable(dev);
-        card->dev->flags &= ~IFF_UP;
         if (card->state == CARD_STATE_UP)
                 card->state = CARD_STATE_SOFTSETUP;
         return 0;
@@ -1137,9 +1137,13 @@ static int qeth_l2_recover(void *ptr)
         if (!rc)
                 PRINT_INFO("Device %s successfully recovered!\n",
                            CARD_BUS_ID(card));
-        else
+        else {
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
                 PRINT_INFO("Device %s could not be recovered!\n",
                            CARD_BUS_ID(card));
+        }
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index dd72c3c20165..99547dea44de 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2795,7 +2795,6 @@ static int qeth_l3_open(struct net_device *dev)
                 return -ENODEV;
         card->data.state = CH_STATE_UP;
         card->state = CARD_STATE_UP;
-        card->dev->flags |= IFF_UP;
         netif_start_queue(dev);
 
         if (!card->lan_online && netif_carrier_ok(dev))
@@ -2809,7 +2808,6 @@ static int qeth_l3_stop(struct net_device *dev)
 
         QETH_DBF_TEXT(TRACE, 4, "qethstop");
         netif_tx_disable(dev);
-        card->dev->flags &= ~IFF_UP;
         if (card->state == CARD_STATE_UP)
                 card->state = CARD_STATE_SOFTSETUP;
         return 0;
@@ -3218,9 +3216,13 @@ static int qeth_l3_recover(void *ptr)
         if (!rc)
                 PRINT_INFO("Device %s successfully recovered!\n",
                            CARD_BUS_ID(card));
-        else
+        else {
+                rtnl_lock();
+                dev_close(card->dev);
+                rtnl_unlock();
                 PRINT_INFO("Device %s could not be recovered!\n",
                            CARD_BUS_ID(card));
+        }
         return 0;
 }