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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (108 commits)
  bridge: ensure to unlock in error path in br_multicast_query().
  drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
  sky2: Avoid rtnl_unlock without rtnl_lock
  ipv6: Send netlink notification when DAD fails
  drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant
  ipconfig: Handle devices which take some time to come up.
  mac80211: Fix memory leak in ieee80211_if_write()
  mac80211: Fix (dynamic) power save entry
  ipw2200: use kmalloc for large local variables
  ath5k: read eeprom IQ calibration values correctly for G mode
  ath5k: fix I/Q calibration (for real)
  ath5k: fix TSF reset
  ath5k: use fixed antenna for tx descriptors
  libipw: split ieee->networks into small pieces
  mac80211: Fix sta_mtx unlocking on insert STA failure path
  rt2x00: remove KSEG1ADDR define from rt2x00soc.h
  net: add ColdFire support to the smc91x driver
  asix: fix setting mac address for AX88772
  ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
  net: Fix dev_mc_add()
  ...

5 files changed, 53 insertions, 56 deletions

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index a3ac4456e0b1..fcd005aad989 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -763,7 +763,8 @@ static inline int qeth_get_micros(void)
 
 static inline int qeth_get_ip_version(struct sk_buff *skb)
 {
-        switch (skb->protocol) {
+        struct ethhdr *ehdr = (struct ethhdr *)skb->data;
+        switch (ehdr->h_proto) {
         case ETH_P_IPV6:
                 return 6;
         case ETH_P_IP:
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 7d25bdd443cd..3bd4206f3470 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -537,7 +537,8 @@ static void qeth_send_control_data_cb(struct qeth_channel *channel,
                         dev_err(&card->gdev->dev,
                                 "The qeth device is not configured "
                                 "for the OSI layer required by z/VM\n");
-                qeth_schedule_recovery(card);
+                else
+                        qeth_schedule_recovery(card);
                 goto out;
         }
 
@@ -1113,8 +1114,6 @@ static int qeth_setup_card(struct qeth_card *card)
         card->ipato.enabled = 0;
         card->ipato.invert4 = 0;
         card->ipato.invert6 = 0;
-        if (card->info.type == QETH_CARD_TYPE_IQD)
-                card->options.checksum_type = NO_CHECKSUMMING;
         /* init QDIO stuff */
         qeth_init_qdio_info(card);
         return 0;
diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 88ae4357136a..25dfd5abd19b 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -8,6 +8,9 @@
  *               Frank Blaschka <frank.blaschka@de.ibm.com>
  */
 
+#define KMSG_COMPONENT "qeth"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/list.h>
 #include <linux/rwsem.h>
 #include <asm/ebcdic.h>
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 51fde6f2e0b8..6f1e3036bafd 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1071,11 +1071,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");
         }
@@ -1129,11 +1127,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);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 5475834ab916..b3b6e872d806 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1691,39 +1691,43 @@ qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply,
 
         cmd = (struct qeth_ipa_cmd *)data;
         rc = cmd->hdr.return_code;
-        if (rc) {
+        if (rc)
                 QETH_DBF_TEXT_(TRACE, 2, "dxter%x", rc);
-                if (cmd->data.diagass.action == QETH_DIAGS_CMD_TRACE_ENABLE) {
-                        switch (rc) {
-                        case IPA_RC_HARDWARE_AUTH_ERROR:
-                                dev_warn(&card->gdev->dev, "The device is not "
-                                        "authorized to run as a HiperSockets "
-                                        "network traffic analyzer\n");
-                                break;
-                        case IPA_RC_TRACE_ALREADY_ACTIVE:
-                                dev_warn(&card->gdev->dev, "A HiperSockets "
-                                        "network traffic analyzer is already "
-                                        "active in the HiperSockets LAN\n");
-                                break;
-                        default:
-                                break;
-                        }
-                }
-                return 0;
-        }
-
         switch (cmd->data.diagass.action) {
         case QETH_DIAGS_CMD_TRACE_QUERY:
                 break;
         case QETH_DIAGS_CMD_TRACE_DISABLE:
-                card->info.promisc_mode = SET_PROMISC_MODE_OFF;
-                dev_info(&card->gdev->dev, "The HiperSockets network traffic "
-                        "analyzer is deactivated\n");
+                switch (rc) {
+                case 0:
+                case IPA_RC_INVALID_SUBCMD:
+                        card->info.promisc_mode = SET_PROMISC_MODE_OFF;
+                        dev_info(&card->gdev->dev, "The HiperSockets network "
+                                "traffic analyzer is deactivated\n");
+                        break;
+                default:
+                        break;
+                }
                 break;
         case QETH_DIAGS_CMD_TRACE_ENABLE:
-                card->info.promisc_mode = SET_PROMISC_MODE_ON;
-                dev_info(&card->gdev->dev, "The HiperSockets network traffic "
-                        "analyzer is activated\n");
+                switch (rc) {
+                case 0:
+                        card->info.promisc_mode = SET_PROMISC_MODE_ON;
+                        dev_info(&card->gdev->dev, "The HiperSockets network "
+                                "traffic analyzer is activated\n");
+                        break;
+                case IPA_RC_HARDWARE_AUTH_ERROR:
+                        dev_warn(&card->gdev->dev, "The device is not "
+                                "authorized to run as a HiperSockets network "
+                                "traffic analyzer\n");
+                        break;
+                case IPA_RC_TRACE_ALREADY_ACTIVE:
+                        dev_warn(&card->gdev->dev, "A HiperSockets "
+                                "network traffic analyzer is already "
+                                "active in the HiperSockets LAN\n");
+                        break;
+                default:
+                        break;
+                }
                 break;
         default:
                 QETH_DBF_MESSAGE(2, "Unknown sniffer action (0x%04x) on %s\n",
@@ -2215,11 +2219,9 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
                 if (recovery_mode)
                         qeth_l3_stop(card->dev);
                 else {
-                        if (card->dev) {
-                                rtnl_lock();
-                                dev_close(card->dev);
-                                rtnl_unlock();
-                        }
+                        rtnl_lock();
+                        dev_close(card->dev);
+                        rtnl_unlock();
                 }
                 if (!card->use_hard_stop) {
                         rc = qeth_send_stoplan(card);
@@ -2900,10 +2902,8 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         int data_offset = -1;
         int nr_frags;
 
-        if ((card->info.type == QETH_CARD_TYPE_IQD) &&
-            (((skb->protocol != htons(ETH_P_IPV6)) &&
-              (skb->protocol != htons(ETH_P_IP))) ||
-             card->options.sniffer))
+        if (((card->info.type == QETH_CARD_TYPE_IQD) && (!ipv)) ||
+             card->options.sniffer)
                         goto tx_drop;
 
         if ((card->state != CARD_STATE_UP) || !card->lan_online) {
@@ -2949,14 +2949,14 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (data_offset < 0)
                         skb_pull(new_skb, ETH_HLEN);
         } else {
-                if (new_skb->protocol == htons(ETH_P_IP)) {
+                if (ipv == 4) {
                         if (card->dev->type == ARPHRD_IEEE802_TR)
                                 skb_pull(new_skb, TR_HLEN);
                         else
                                 skb_pull(new_skb, ETH_HLEN);
                 }
 
-                if (new_skb->protocol == ETH_P_IPV6 && card->vlangrp &&
+                if (ipv == 6 && card->vlangrp &&
                                 vlan_tx_tag_present(new_skb)) {
                         skb_push(new_skb, VLAN_HLEN);
                         skb_copy_to_linear_data(new_skb, new_skb->data + 4, 4);
@@ -3534,11 +3534,9 @@ static int qeth_l3_pm_resume(struct ccwgroup_device *gdev)
         if (card->state == CARD_STATE_RECOVER) {
                 rc = __qeth_l3_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_l3_set_online(card->gdev, 0);