]> nv-tegra.nvidia Code Review - linux-3.10.git/blobdiff - drivers/s390/net/qeth_l3_main.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-3.10.git] / drivers / s390 / net / qeth_l3_main.c
index 50545a1f6b3bee1df868b17700b6684c1114bbe8..7be5e9775691b5a4f227bb06ef6a10226b118dbf 100644 (file)
@@ -1,32 +1,40 @@
 /*
  *  drivers/s390/net/qeth_l3_main.c
  *
- *    Copyright IBM Corp. 2007
+ *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
  *              Frank Pavlic <fpavlic@de.ibm.com>,
  *              Thomas Spatzier <tspat@de.ibm.com>,
  *              Frank Blaschka <frank.blaschka@de.ibm.com>
  */
 
+#define KMSG_COMPONENT "qeth"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/bitops.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
 #include <linux/ip.h>
-#include <linux/reboot.h>
+#include <linux/ipv6.h>
 #include <linux/inetdevice.h>
 #include <linux/igmp.h>
+#include <linux/slab.h>
+#include <linux/if_vlan.h>
 
 #include <net/ip.h>
 #include <net/arp.h>
-
-#include <asm/s390_rdev.h>
+#include <net/route.h>
+#include <net/ip6_fib.h>
+#include <net/ip6_checksum.h>
+#include <net/iucv/af_iucv.h>
 
 #include "qeth_l3.h"
-#include "qeth_core_offl.h"
+
 
 static int qeth_l3_set_offline(struct ccwgroup_device *);
 static int qeth_l3_recover(void *);
@@ -40,7 +48,6 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *,
 static int __qeth_l3_set_online(struct ccwgroup_device *, int);
 static int __qeth_l3_set_offline(struct ccwgroup_device *, int);
 
-
 static int qeth_l3_isxdigit(char *buf)
 {
        while (*buf) {
@@ -75,12 +82,7 @@ int qeth_l3_string_to_ipaddr4(const char *buf, __u8 *addr)
 
 void qeth_l3_ipaddr6_to_string(const __u8 *addr, char *buf)
 {
-       sprintf(buf, "%02x%02x:%02x%02x:%02x%02x:%02x%02x"
-                    ":%02x%02x:%02x%02x:%02x%02x:%02x%02x",
-                    addr[0], addr[1], addr[2], addr[3],
-                    addr[4], addr[5], addr[6], addr[7],
-                    addr[8], addr[9], addr[10], addr[11],
-                    addr[12], addr[13], addr[14], addr[15]);
+       sprintf(buf, "%pI6", addr);
 }
 
 int qeth_l3_string_to_ipaddr6(const char *buf, __u8 *addr)
@@ -167,7 +169,7 @@ static void qeth_l3_convert_addr_to_bits(u8 *addr, u8 *bits, int len)
        }
 }
 
-static int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
+int qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
                                                struct qeth_ipaddr *addr)
 {
        struct qeth_ipato_entry *ipatoe;
@@ -215,6 +217,8 @@ static int __qeth_l3_insert_ip_todo(struct qeth_card *card,
        struct qeth_ipaddr *tmp, *t;
        int found = 0;
 
+       if (card->options.sniffer)
+               return 0;
        list_for_each_entry_safe(tmp, t, card->ip_tbd_list, entry) {
                if ((addr->type == QETH_IP_TYPE_DEL_ALL_MC) &&
                    (tmp->type == QETH_IP_TYPE_DEL_ALL_MC))
@@ -257,7 +261,7 @@ static int __qeth_l3_insert_ip_todo(struct qeth_card *card,
                                addr->users += add ? 1 : -1;
                        if (add && (addr->type == QETH_IP_TYPE_NORMAL) &&
                            qeth_l3_is_addr_covered_by_ipato(card, addr)) {
-                               QETH_DBF_TEXT(TRACE, 2, "tkovaddr");
+                               QETH_CARD_TEXT(card, 2, "tkovaddr");
                                addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;
                        }
                        list_add_tail(&addr->entry, card->ip_tbd_list);
@@ -266,18 +270,18 @@ static int __qeth_l3_insert_ip_todo(struct qeth_card *card,
        }
 }
 
-static int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
+int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
 {
        unsigned long flags;
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 4, "delip");
+       QETH_CARD_TEXT(card, 4, "delip");
 
        if (addr->proto == QETH_PROT_IPV4)
-               QETH_DBF_HEX(TRACE, 4, &addr->u.a4.addr, 4);
+               QETH_CARD_HEX(card, 4, &addr->u.a4.addr, 4);
        else {
-               QETH_DBF_HEX(TRACE, 4, &addr->u.a6.addr, 8);
-               QETH_DBF_HEX(TRACE, 4, ((char *)&addr->u.a6.addr) + 8, 8);
+               QETH_CARD_HEX(card, 4, &addr->u.a6.addr, 8);
+               QETH_CARD_HEX(card, 4, ((char *)&addr->u.a6.addr) + 8, 8);
        }
        spin_lock_irqsave(&card->ip_lock, flags);
        rc = __qeth_l3_insert_ip_todo(card, addr, 0);
@@ -285,17 +289,17 @@ static int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
        return rc;
 }
 
-static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
+int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
 {
        unsigned long flags;
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 4, "addip");
+       QETH_CARD_TEXT(card, 4, "addip");
        if (addr->proto == QETH_PROT_IPV4)
-               QETH_DBF_HEX(TRACE, 4, &addr->u.a4.addr, 4);
+               QETH_CARD_HEX(card, 4, &addr->u.a4.addr, 4);
        else {
-               QETH_DBF_HEX(TRACE, 4, &addr->u.a6.addr, 8);
-               QETH_DBF_HEX(TRACE, 4, ((char *)&addr->u.a6.addr) + 8, 8);
+               QETH_CARD_HEX(card, 4, &addr->u.a6.addr, 8);
+               QETH_CARD_HEX(card, 4, ((char *)&addr->u.a6.addr) + 8, 8);
        }
        spin_lock_irqsave(&card->ip_lock, flags);
        rc = __qeth_l3_insert_ip_todo(card, addr, 1);
@@ -304,14 +308,13 @@ static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
 }
 
 
-static struct qeth_ipaddr *qeth_l3_get_addr_buffer(
+struct qeth_ipaddr *qeth_l3_get_addr_buffer(
                                enum qeth_prot_versions prot)
 {
        struct qeth_ipaddr *addr;
 
        addr = kzalloc(sizeof(struct qeth_ipaddr), GFP_ATOMIC);
        if (addr == NULL) {
-               PRINT_WARN("Not enough memory to add address\n");
                return NULL;
        }
        addr->type = QETH_IP_TYPE_NORMAL;
@@ -324,10 +327,10 @@ static void qeth_l3_delete_mc_addresses(struct qeth_card *card)
        struct qeth_ipaddr *iptodo;
        unsigned long flags;
 
-       QETH_DBF_TEXT(TRACE, 4, "delmc");
+       QETH_CARD_TEXT(card, 4, "delmc");
        iptodo = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
        if (!iptodo) {
-               QETH_DBF_TEXT(TRACE, 2, "dmcnomem");
+               QETH_CARD_TEXT(card, 2, "dmcnomem");
                return;
        }
        iptodo->type = QETH_IP_TYPE_DEL_ALL_MC;
@@ -421,21 +424,26 @@ again:
        list_splice(&fail_list, &card->ip_list);
 }
 
-static void qeth_l3_set_ip_addr_list(struct qeth_card *card)
+void qeth_l3_set_ip_addr_list(struct qeth_card *card)
 {
        struct list_head *tbd_list;
        struct qeth_ipaddr *todo, *addr;
        unsigned long flags;
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 2, "sdiplist");
-       QETH_DBF_HEX(TRACE, 2, &card, sizeof(void *));
+       QETH_CARD_TEXT(card, 2, "sdiplist");
+       QETH_CARD_HEX(card, 2, &card, sizeof(void *));
+
+       if ((card->state != CARD_STATE_UP &&
+            card->state != CARD_STATE_SOFTSETUP) || card->options.sniffer) {
+               return;
+       }
 
        spin_lock_irqsave(&card->ip_lock, flags);
        tbd_list = card->ip_tbd_list;
-       card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_ATOMIC);
+       card->ip_tbd_list = kzalloc(sizeof(struct list_head), GFP_ATOMIC);
        if (!card->ip_tbd_list) {
-               QETH_DBF_TEXT(TRACE, 0, "silnomem");
+               QETH_CARD_TEXT(card, 0, "silnomem");
                card->ip_tbd_list = tbd_list;
                spin_unlock_irqrestore(&card->ip_lock, flags);
                return;
@@ -469,7 +477,7 @@ static void qeth_l3_set_ip_addr_list(struct qeth_card *card)
                        spin_unlock_irqrestore(&card->ip_lock, flags);
                        rc = qeth_l3_deregister_addr_entry(card, addr);
                        spin_lock_irqsave(&card->ip_lock, flags);
-                       if (!rc || (rc == IPA_RC_PRIMARY_ALREADY_DEFINED))
+                       if (!rc || (rc == IPA_RC_IP_ADDRESS_NOT_DEFINED))
                                kfree(addr);
                        else
                                list_add_tail(&addr->entry, &card->ip_list);
@@ -480,13 +488,14 @@ static void qeth_l3_set_ip_addr_list(struct qeth_card *card)
        kfree(tbd_list);
 }
 
-static void qeth_l3_clear_ip_list(struct qeth_card *card, int clean,
-                                       int recover)
+static void qeth_l3_clear_ip_list(struct qeth_card *card, int recover)
 {
        struct qeth_ipaddr *addr, *tmp;
        unsigned long flags;
 
-       QETH_DBF_TEXT(TRACE, 4, "clearip");
+       QETH_CARD_TEXT(card, 4, "clearip");
+       if (recover && card->options.sniffer)
+               return;
        spin_lock_irqsave(&card->ip_lock, flags);
        /* clear todo list */
        list_for_each_entry_safe(addr, tmp, card->ip_tbd_list, entry) {
@@ -498,11 +507,6 @@ static void qeth_l3_clear_ip_list(struct qeth_card *card, int clean,
                addr = list_entry(card->ip_list.next,
                                  struct qeth_ipaddr, entry);
                list_del_init(&addr->entry);
-               if (clean) {
-                       spin_unlock_irqrestore(&card->ip_lock, flags);
-                       qeth_l3_deregister_addr_entry(card, addr);
-                       spin_lock_irqsave(&card->ip_lock, flags);
-               }
                if (!recover || addr->is_multicast) {
                        kfree(addr);
                        continue;
@@ -544,7 +548,7 @@ static int qeth_l3_send_setdelmc(struct qeth_card *card,
        struct qeth_cmd_buffer *iob;
        struct qeth_ipa_cmd *cmd;
 
-       QETH_DBF_TEXT(TRACE, 4, "setdelmc");
+       QETH_CARD_TEXT(card, 4, "setdelmc");
 
        iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);
        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
@@ -582,8 +586,8 @@ static int qeth_l3_send_setdelip(struct qeth_card *card,
        struct qeth_ipa_cmd *cmd;
        __u8 netmask[16];
 
-       QETH_DBF_TEXT(TRACE, 4, "setdelip");
-       QETH_DBF_TEXT_(TRACE, 4, "flags%02X", flags);
+       QETH_CARD_TEXT(card, 4, "setdelip");
+       QETH_CARD_TEXT_(card, 4, "flags%02X", flags);
 
        iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);
        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
@@ -612,7 +616,7 @@ static int qeth_l3_send_setrouting(struct qeth_card *card,
        struct qeth_ipa_cmd *cmd;
        struct qeth_cmd_buffer *iob;
 
-       QETH_DBF_TEXT(TRACE, 4, "setroutg");
+       QETH_CARD_TEXT(card, 4, "setroutg");
        iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETRTG, prot);
        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
        cmd->data.setrtg.type = (type);
@@ -649,15 +653,6 @@ static void qeth_l3_correct_routing_type(struct qeth_card *card,
                }
        }
 out_inval:
-       PRINT_WARN("Routing type '%s' not supported for interface %s.\n"
-                  "Router status set to 'no router'.\n",
-                  ((*type == PRIMARY_ROUTER)? "primary router" :
-                   (*type == SECONDARY_ROUTER)? "secondary router" :
-                   (*type == PRIMARY_CONNECTOR)? "primary connector" :
-                   (*type == SECONDARY_CONNECTOR)? "secondary connector" :
-                   (*type == MULTICAST_ROUTER)? "multicast router" :
-                   "unknown"),
-                  card->dev->name);
        *type = NO_ROUTER;
 }
 
@@ -665,7 +660,7 @@ int qeth_l3_setrouting_v4(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "setrtg4");
+       QETH_CARD_TEXT(card, 3, "setrtg4");
 
        qeth_l3_correct_routing_type(card, &card->options.route4.type,
                                  QETH_PROT_IPV4);
@@ -674,9 +669,9 @@ int qeth_l3_setrouting_v4(struct qeth_card *card)
                                  QETH_PROT_IPV4);
        if (rc) {
                card->options.route4.type = NO_ROUTER;
-               PRINT_WARN("Error (0x%04x) while setting routing type on %s. "
-                          "Type set to 'no router'.\n",
-                          rc, QETH_CARD_IFNAME(card));
+               QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type"
+                       " on %s. Type set to 'no router'.\n", rc,
+                       QETH_CARD_IFNAME(card));
        }
        return rc;
 }
@@ -685,7 +680,7 @@ int qeth_l3_setrouting_v6(struct qeth_card *card)
 {
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 3, "setrtg6");
+       QETH_CARD_TEXT(card, 3, "setrtg6");
 #ifdef CONFIG_QETH_IPV6
 
        if (!qeth_is_supported(card, IPA_IPV6))
@@ -697,9 +692,9 @@ int qeth_l3_setrouting_v6(struct qeth_card *card)
                                  QETH_PROT_IPV6);
        if (rc) {
                card->options.route6.type = NO_ROUTER;
-               PRINT_WARN("Error (0x%04x) while setting routing type on %s. "
-                          "Type set to 'no router'.\n",
-                          rc, QETH_CARD_IFNAME(card));
+               QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type"
+                       " on %s. Type set to 'no router'.\n", rc,
+                       QETH_CARD_IFNAME(card));
        }
 #endif
        return rc;
@@ -729,7 +724,7 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,
        unsigned long flags;
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 2, "addipato");
+       QETH_CARD_TEXT(card, 2, "addipato");
        spin_lock_irqsave(&card->ip_lock, flags);
        list_for_each_entry(ipatoe, &card->ipato.entries, entry) {
                if (ipatoe->proto != new->proto)
@@ -737,7 +732,6 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,
                if (!memcmp(ipatoe->addr, new->addr,
                            (ipatoe->proto == QETH_PROT_IPV4)? 4:16) &&
                    (ipatoe->mask_bits == new->mask_bits)) {
-                       PRINT_WARN("ipato entry already exists!\n");
                        rc = -EEXIST;
                        break;
                }
@@ -755,7 +749,7 @@ void qeth_l3_del_ipato_entry(struct qeth_card *card,
        struct qeth_ipato_entry *ipatoe, *tmp;
        unsigned long flags;
 
-       QETH_DBF_TEXT(TRACE, 2, "delipato");
+       QETH_CARD_TEXT(card, 2, "delipato");
        spin_lock_irqsave(&card->ip_lock, flags);
        list_for_each_entry_safe(ipatoe, tmp, &card->ipato.entries, entry) {
                if (ipatoe->proto != proto)
@@ -783,11 +777,11 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
        ipaddr = qeth_l3_get_addr_buffer(proto);
        if (ipaddr) {
                if (proto == QETH_PROT_IPV4) {
-                       QETH_DBF_TEXT(TRACE, 2, "addvipa4");
+                       QETH_CARD_TEXT(card, 2, "addvipa4");
                        memcpy(&ipaddr->u.a4.addr, addr, 4);
                        ipaddr->u.a4.mask = 0;
                } else if (proto == QETH_PROT_IPV6) {
-                       QETH_DBF_TEXT(TRACE, 2, "addvipa6");
+                       QETH_CARD_TEXT(card, 2, "addvipa6");
                        memcpy(&ipaddr->u.a6.addr, addr, 16);
                        ipaddr->u.a6.pfxlen = 0;
                }
@@ -802,7 +796,6 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
                rc = -EEXIST;
        spin_unlock_irqrestore(&card->ip_lock, flags);
        if (rc) {
-               PRINT_WARN("Cannot add VIPA. Address already exists!\n");
                return rc;
        }
        if (!qeth_l3_add_ip(card, ipaddr))
@@ -819,11 +812,11 @@ void qeth_l3_del_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
        ipaddr = qeth_l3_get_addr_buffer(proto);
        if (ipaddr) {
                if (proto == QETH_PROT_IPV4) {
-                       QETH_DBF_TEXT(TRACE, 2, "delvipa4");
+                       QETH_CARD_TEXT(card, 2, "delvipa4");
                        memcpy(&ipaddr->u.a4.addr, addr, 4);
                        ipaddr->u.a4.mask = 0;
                } else if (proto == QETH_PROT_IPV6) {
-                       QETH_DBF_TEXT(TRACE, 2, "delvipa6");
+                       QETH_CARD_TEXT(card, 2, "delvipa6");
                        memcpy(&ipaddr->u.a6.addr, addr, 16);
                        ipaddr->u.a6.pfxlen = 0;
                }
@@ -848,11 +841,11 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
        ipaddr = qeth_l3_get_addr_buffer(proto);
        if (ipaddr) {
                if (proto == QETH_PROT_IPV4) {
-                       QETH_DBF_TEXT(TRACE, 2, "addrxip4");
+                       QETH_CARD_TEXT(card, 2, "addrxip4");
                        memcpy(&ipaddr->u.a4.addr, addr, 4);
                        ipaddr->u.a4.mask = 0;
                } else if (proto == QETH_PROT_IPV6) {
-                       QETH_DBF_TEXT(TRACE, 2, "addrxip6");
+                       QETH_CARD_TEXT(card, 2, "addrxip6");
                        memcpy(&ipaddr->u.a6.addr, addr, 16);
                        ipaddr->u.a6.pfxlen = 0;
                }
@@ -867,7 +860,6 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
                rc = -EEXIST;
        spin_unlock_irqrestore(&card->ip_lock, flags);
        if (rc) {
-               PRINT_WARN("Cannot add RXIP. Address already exists!\n");
                return rc;
        }
        if (!qeth_l3_add_ip(card, ipaddr))
@@ -884,11 +876,11 @@ void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
        ipaddr = qeth_l3_get_addr_buffer(proto);
        if (ipaddr) {
                if (proto == QETH_PROT_IPV4) {
-                       QETH_DBF_TEXT(TRACE, 2, "addrxip4");
+                       QETH_CARD_TEXT(card, 2, "addrxip4");
                        memcpy(&ipaddr->u.a4.addr, addr, 4);
                        ipaddr->u.a4.mask = 0;
                } else if (proto == QETH_PROT_IPV6) {
-                       QETH_DBF_TEXT(TRACE, 2, "addrxip6");
+                       QETH_CARD_TEXT(card, 2, "addrxip6");
                        memcpy(&ipaddr->u.a6.addr, addr, 16);
                        ipaddr->u.a6.pfxlen = 0;
                }
@@ -908,15 +900,15 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,
        int cnt = 3;
 
        if (addr->proto == QETH_PROT_IPV4) {
-               QETH_DBF_TEXT(TRACE, 2, "setaddr4");
-               QETH_DBF_HEX(TRACE, 3, &addr->u.a4.addr, sizeof(int));
+               QETH_CARD_TEXT(card, 2, "setaddr4");
+               QETH_CARD_HEX(card, 3, &addr->u.a4.addr, sizeof(int));
        } else if (addr->proto == QETH_PROT_IPV6) {
-               QETH_DBF_TEXT(TRACE, 2, "setaddr6");
-               QETH_DBF_HEX(TRACE, 3, &addr->u.a6.addr, 8);
-               QETH_DBF_HEX(TRACE, 3, ((char *)&addr->u.a6.addr) + 8, 8);
+               QETH_CARD_TEXT(card, 2, "setaddr6");
+               QETH_CARD_HEX(card, 3, &addr->u.a6.addr, 8);
+               QETH_CARD_HEX(card, 3, ((char *)&addr->u.a6.addr) + 8, 8);
        } else {
-               QETH_DBF_TEXT(TRACE, 2, "setaddr?");
-               QETH_DBF_HEX(TRACE, 3, addr, sizeof(struct qeth_ipaddr));
+               QETH_CARD_TEXT(card, 2, "setaddr?");
+               QETH_CARD_HEX(card, 3, addr, sizeof(struct qeth_ipaddr));
        }
        do {
                if (addr->is_multicast)
@@ -925,13 +917,13 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,
                        rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_SETIP,
                                        addr->set_flags);
                if (rc)
-                       QETH_DBF_TEXT(TRACE, 2, "failed");
+                       QETH_CARD_TEXT(card, 2, "failed");
        } while ((--cnt > 0) && rc);
        if (rc) {
-               QETH_DBF_TEXT(TRACE, 2, "FAILED");
+               QETH_CARD_TEXT(card, 2, "FAILED");
                qeth_l3_ipaddr_to_string(addr->proto, (u8 *)&addr->u, buf);
-               PRINT_WARN("Could not register IP address %s (rc=0x%x/%d)\n",
-                          buf, rc, rc);
+               dev_warn(&card->gdev->dev,
+                       "Registering IP address %s failed\n", buf);
        }
        return rc;
 }
@@ -942,30 +934,23 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card,
        int rc = 0;
 
        if (addr->proto == QETH_PROT_IPV4) {
-               QETH_DBF_TEXT(TRACE, 2, "deladdr4");
-               QETH_DBF_HEX(TRACE, 3, &addr->u.a4.addr, sizeof(int));
+               QETH_CARD_TEXT(card, 2, "deladdr4");
+               QETH_CARD_HEX(card, 3, &addr->u.a4.addr, sizeof(int));
        } else if (addr->proto == QETH_PROT_IPV6) {
-               QETH_DBF_TEXT(TRACE, 2, "deladdr6");
-               QETH_DBF_HEX(TRACE, 3, &addr->u.a6.addr, 8);
-               QETH_DBF_HEX(TRACE, 3, ((char *)&addr->u.a6.addr) + 8, 8);
+               QETH_CARD_TEXT(card, 2, "deladdr6");
+               QETH_CARD_HEX(card, 3, &addr->u.a6.addr, 8);
+               QETH_CARD_HEX(card, 3, ((char *)&addr->u.a6.addr) + 8, 8);
        } else {
-               QETH_DBF_TEXT(TRACE, 2, "deladdr?");
-               QETH_DBF_HEX(TRACE, 3, addr, sizeof(struct qeth_ipaddr));
+               QETH_CARD_TEXT(card, 2, "deladdr?");
+               QETH_CARD_HEX(card, 3, addr, sizeof(struct qeth_ipaddr));
        }
        if (addr->is_multicast)
                rc = qeth_l3_send_setdelmc(card, addr, IPA_CMD_DELIPM);
        else
                rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_DELIP,
                                        addr->del_flags);
-       if (rc) {
-               QETH_DBF_TEXT(TRACE, 2, "failed");
-               /* TODO: re-activate this warning as soon as we have a
-                * clean mirco code
-               qeth_ipaddr_to_string(addr->proto, (u8 *)&addr->u, buf);
-               PRINT_WARN("Could not deregister IP address %s (rc=%x)\n",
-                          buf, rc);
-               */
-       }
+       if (rc)
+               QETH_CARD_TEXT(card, 2, "failed");
 
        return rc;
 }
@@ -991,57 +976,6 @@ static inline u8 qeth_l3_get_qeth_hdr_flags6(int cast_type)
        return ct | QETH_CAST_UNICAST;
 }
 
-static int qeth_l3_send_setadp_mode(struct qeth_card *card, __u32 command,
-                                       __u32 mode)
-{
-       int rc;
-       struct qeth_cmd_buffer *iob;
-       struct qeth_ipa_cmd *cmd;
-
-       QETH_DBF_TEXT(TRACE, 4, "adpmode");
-
-       iob = qeth_get_adapter_cmd(card, command,
-                                  sizeof(struct qeth_ipacmd_setadpparms));
-       cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
-       cmd->data.setadapterparms.data.mode = mode;
-       rc = qeth_send_ipa_cmd(card, iob, qeth_default_setadapterparms_cb,
-                              NULL);
-       return rc;
-}
-
-static int qeth_l3_setadapter_hstr(struct qeth_card *card)
-{
-       int rc;
-
-       QETH_DBF_TEXT(TRACE, 4, "adphstr");
-
-       if (qeth_adp_supported(card, IPA_SETADP_SET_BROADCAST_MODE)) {
-               rc = qeth_l3_send_setadp_mode(card,
-                                       IPA_SETADP_SET_BROADCAST_MODE,
-                                       card->options.broadcast_mode);
-               if (rc)
-                       PRINT_WARN("couldn't set broadcast mode on "
-                                  "device %s: x%x\n",
-                                  CARD_BUS_ID(card), rc);
-               rc = qeth_l3_send_setadp_mode(card,
-                                       IPA_SETADP_ALTER_MAC_ADDRESS,
-                                       card->options.macaddr_mode);
-               if (rc)
-                       PRINT_WARN("couldn't set macaddr mode on "
-                                  "device %s: x%x\n", CARD_BUS_ID(card), rc);
-               return rc;
-       }
-       if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL)
-               PRINT_WARN("set adapter parameters not available "
-                          "to set broadcast mode, using ALLRINGS "
-                          "on device %s:\n", CARD_BUS_ID(card));
-       if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL)
-               PRINT_WARN("set adapter parameters not available "
-                          "to set macaddr mode, using NONCANONICAL "
-                          "on device %s:\n", CARD_BUS_ID(card));
-       return 0;
-}
-
 static int qeth_l3_setadapter_parms(struct qeth_card *card)
 {
        int rc;
@@ -1049,30 +983,24 @@ static int qeth_l3_setadapter_parms(struct qeth_card *card)
        QETH_DBF_TEXT(SETUP, 2, "setadprm");
 
        if (!qeth_is_supported(card, IPA_SETADAPTERPARMS)) {
-               PRINT_WARN("set adapter parameters not supported "
-                          "on device %s.\n",
-                          CARD_BUS_ID(card));
+               dev_info(&card->gdev->dev,
+                       "set adapter parameters not supported.\n");
                QETH_DBF_TEXT(SETUP, 2, " notsupp");
                return 0;
        }
        rc = qeth_query_setadapterparms(card);
        if (rc) {
-               PRINT_WARN("couldn't set adapter parameters on device %s: "
-                          "x%x\n", CARD_BUS_ID(card), rc);
+               QETH_DBF_MESSAGE(2, "%s couldn't set adapter parameters: "
+                       "0x%x\n", dev_name(&card->gdev->dev), rc);
                return rc;
        }
        if (qeth_adp_supported(card, IPA_SETADP_ALTER_MAC_ADDRESS)) {
                rc = qeth_setadpparms_change_macaddr(card);
                if (rc)
-                       PRINT_WARN("couldn't get MAC address on "
-                                  "device %s: x%x\n",
-                                  CARD_BUS_ID(card), rc);
+                       dev_warn(&card->gdev->dev, "Reading the adapter MAC"
+                               " address failed\n");
        }
 
-       if ((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
-           (card->info.link_type == QETH_LINK_TYPE_LANE_TR))
-               rc = qeth_l3_setadapter_hstr(card);
-
        return rc;
 }
 
@@ -1081,7 +1009,7 @@ static int qeth_l3_default_setassparms_cb(struct qeth_card *card,
 {
        struct qeth_ipa_cmd *cmd;
 
-       QETH_DBF_TEXT(TRACE, 4, "defadpcb");
+       QETH_CARD_TEXT(card, 4, "defadpcb");
 
        cmd = (struct qeth_ipa_cmd *) data;
        if (cmd->hdr.return_code == 0) {
@@ -1094,8 +1022,15 @@ static int qeth_l3_default_setassparms_cb(struct qeth_card *card,
        if (cmd->data.setassparms.hdr.assist_no == IPA_INBOUND_CHECKSUM &&
            cmd->data.setassparms.hdr.command_code == IPA_CMD_ASS_START) {
                card->info.csum_mask = cmd->data.setassparms.data.flags_32bit;
-               QETH_DBF_TEXT_(TRACE, 3, "csum:%d", card->info.csum_mask);
+               QETH_CARD_TEXT_(card, 3, "csum:%d", card->info.csum_mask);
+       }
+       if (cmd->data.setassparms.hdr.assist_no == IPA_OUTBOUND_CHECKSUM &&
+           cmd->data.setassparms.hdr.command_code == IPA_CMD_ASS_START) {
+               card->info.tx_csum_mask =
+                       cmd->data.setassparms.data.flags_32bit;
+               QETH_CARD_TEXT_(card, 3, "tcsu:%d", card->info.tx_csum_mask);
        }
+
        return 0;
 }
 
@@ -1106,7 +1041,7 @@ static struct qeth_cmd_buffer *qeth_l3_get_setassparms_cmd(
        struct qeth_cmd_buffer *iob;
        struct qeth_ipa_cmd *cmd;
 
-       QETH_DBF_TEXT(TRACE, 4, "getasscm");
+       QETH_CARD_TEXT(card, 4, "getasscm");
        iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETASSPARMS, prot);
 
        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
@@ -1128,7 +1063,7 @@ static int qeth_l3_send_setassparms(struct qeth_card *card,
        int rc;
        struct qeth_ipa_cmd *cmd;
 
-       QETH_DBF_TEXT(TRACE, 4, "sendassp");
+       QETH_CARD_TEXT(card, 4, "sendassp");
 
        cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
        if (len <= sizeof(__u32))
@@ -1147,7 +1082,7 @@ static int qeth_l3_send_simple_setassparms_ipv6(struct qeth_card *card,
        int rc;
        struct qeth_cmd_buffer *iob;
 
-       QETH_DBF_TEXT(TRACE, 4, "simassp6");
+       QETH_CARD_TEXT(card, 4, "simassp6");
        iob = qeth_l3_get_setassparms_cmd(card, ipa_func, cmd_code,
                                       0, QETH_PROT_IPV6);
        rc = qeth_l3_send_setassparms(card, iob, 0, 0,
@@ -1163,7 +1098,7 @@ static int qeth_l3_send_simple_setassparms(struct qeth_card *card,
        int length = 0;
        struct qeth_cmd_buffer *iob;
 
-       QETH_DBF_TEXT(TRACE, 4, "simassp4");
+       QETH_CARD_TEXT(card, 4, "simassp4");
        if (data)
                length = sizeof(__u32);
        iob = qeth_l3_get_setassparms_cmd(card, ipa_func, cmd_code,
@@ -1177,19 +1112,20 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "ipaarp");
+       QETH_CARD_TEXT(card, 3, "ipaarp");
 
        if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
-               PRINT_WARN("ARP processing not supported "
-                          "on %s!\n", QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "ARP processing not supported on %s!\n",
+                       QETH_CARD_IFNAME(card));
                return 0;
        }
        rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING,
                                        IPA_CMD_ASS_START, 0);
        if (rc) {
-               PRINT_WARN("Could not start ARP processing "
-                          "assist on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Starting ARP processing support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
        }
        return rc;
 }
@@ -1198,22 +1134,24 @@ static int qeth_l3_start_ipa_ip_fragmentation(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "ipaipfrg");
+       QETH_CARD_TEXT(card, 3, "ipaipfrg");
 
        if (!qeth_is_supported(card, IPA_IP_FRAGMENTATION)) {
-               PRINT_INFO("Hardware IP fragmentation not supported on %s\n",
-                          QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "Hardware IP fragmentation not supported on %s\n",
+                       QETH_CARD_IFNAME(card));
                return  -EOPNOTSUPP;
        }
 
        rc = qeth_l3_send_simple_setassparms(card, IPA_IP_FRAGMENTATION,
                                          IPA_CMD_ASS_START, 0);
        if (rc) {
-               PRINT_WARN("Could not start Hardware IP fragmentation "
-                          "assist on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Starting IP fragmentation support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
        } else
-               PRINT_INFO("Hardware IP fragmentation enabled \n");
+               dev_info(&card->gdev->dev,
+                       "Hardware IP fragmentation enabled \n");
        return rc;
 }
 
@@ -1221,23 +1159,21 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "stsrcmac");
-
-       if (!card->options.fake_ll)
-               return -EOPNOTSUPP;
+       QETH_CARD_TEXT(card, 3, "stsrcmac");
 
        if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
-               PRINT_INFO("Inbound source address not "
-                          "supported on %s\n", QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "Inbound source MAC-address not supported on %s\n",
+                       QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
 
        rc = qeth_l3_send_simple_setassparms(card, IPA_SOURCE_MAC,
                                          IPA_CMD_ASS_START, 0);
        if (rc)
-               PRINT_WARN("Could not start inbound source "
-                          "assist on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Starting source MAC-address support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
        return rc;
 }
 
@@ -1245,22 +1181,22 @@ static int qeth_l3_start_ipa_vlan(struct qeth_card *card)
 {
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 3, "strtvlan");
+       QETH_CARD_TEXT(card, 3, "strtvlan");
 
        if (!qeth_is_supported(card, IPA_FULL_VLAN)) {
-               PRINT_WARN("VLAN not supported on %s\n",
-                               QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "VLAN not supported on %s\n", QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
 
        rc = qeth_l3_send_simple_setassparms(card, IPA_VLAN_PRIO,
                                          IPA_CMD_ASS_START, 0);
        if (rc) {
-               PRINT_WARN("Could not start vlan "
-                          "assist on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Starting VLAN support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
        } else {
-               PRINT_INFO("VLAN enabled \n");
+               dev_info(&card->gdev->dev, "VLAN enabled\n");
        }
        return rc;
 }
@@ -1269,102 +1205,71 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "stmcast");
+       QETH_CARD_TEXT(card, 3, "stmcast");
 
        if (!qeth_is_supported(card, IPA_MULTICASTING)) {
-               PRINT_WARN("Multicast not supported on %s\n",
-                          QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "Multicast not supported on %s\n",
+                       QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
 
        rc = qeth_l3_send_simple_setassparms(card, IPA_MULTICASTING,
                                          IPA_CMD_ASS_START, 0);
        if (rc) {
-               PRINT_WARN("Could not start multicast "
-                          "assist on %s: rc=%i\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Starting multicast support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
        } else {
-               PRINT_INFO("Multicast enabled\n");
+               dev_info(&card->gdev->dev, "Multicast enabled\n");
                card->dev->flags |= IFF_MULTICAST;
        }
        return rc;
 }
 
-static int qeth_l3_query_ipassists_cb(struct qeth_card *card,
-               struct qeth_reply *reply, unsigned long data)
-{
-       struct qeth_ipa_cmd *cmd;
-
-       QETH_DBF_TEXT(SETUP, 2, "qipasscb");
-
-       cmd = (struct qeth_ipa_cmd *) data;
-       if (cmd->hdr.prot_version == QETH_PROT_IPV4) {
-               card->options.ipa4.supported_funcs = cmd->hdr.ipa_supported;
-               card->options.ipa4.enabled_funcs = cmd->hdr.ipa_enabled;
-       } else {
-               card->options.ipa6.supported_funcs = cmd->hdr.ipa_supported;
-               card->options.ipa6.enabled_funcs = cmd->hdr.ipa_enabled;
-       }
-       QETH_DBF_TEXT(SETUP, 2, "suppenbl");
-       QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_supported);
-       QETH_DBF_TEXT_(SETUP, 2, "%x", cmd->hdr.ipa_enabled);
-       return 0;
-}
-
-static int qeth_l3_query_ipassists(struct qeth_card *card,
-                               enum qeth_prot_versions prot)
-{
-       int rc;
-       struct qeth_cmd_buffer *iob;
-
-       QETH_DBF_TEXT_(SETUP, 2, "qipassi%i", prot);
-       iob = qeth_get_ipacmd_buffer(card, IPA_CMD_QIPASSIST, prot);
-       rc = qeth_send_ipa_cmd(card, iob, qeth_l3_query_ipassists_cb, NULL);
-       return rc;
-}
-
 #ifdef CONFIG_QETH_IPV6
 static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "softipv6");
+       QETH_CARD_TEXT(card, 3, "softipv6");
 
        if (card->info.type == QETH_CARD_TYPE_IQD)
                goto out;
 
-       rc = qeth_l3_query_ipassists(card, QETH_PROT_IPV6);
+       rc = qeth_query_ipassists(card, QETH_PROT_IPV6);
        if (rc) {
-               PRINT_ERR("IPv6 query ipassist failed on %s\n",
-                         QETH_CARD_IFNAME(card));
+               dev_err(&card->gdev->dev,
+                       "Activating IPv6 support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
                return rc;
        }
        rc = qeth_l3_send_simple_setassparms(card, IPA_IPV6,
                                          IPA_CMD_ASS_START, 3);
        if (rc) {
-               PRINT_WARN("IPv6 start assist (version 4) failed "
-                          "on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_err(&card->gdev->dev,
+                       "Activating IPv6 support for %s failed\n",
+                       QETH_CARD_IFNAME(card));
                return rc;
        }
        rc = qeth_l3_send_simple_setassparms_ipv6(card, IPA_IPV6,
                                               IPA_CMD_ASS_START);
        if (rc) {
-               PRINT_WARN("IPV6 start assist (version 6) failed  "
-                          "on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_err(&card->gdev->dev,
+                       "Activating IPv6 support for %s failed\n",
+                        QETH_CARD_IFNAME(card));
                return rc;
        }
        rc = qeth_l3_send_simple_setassparms_ipv6(card, IPA_PASSTHRU,
                                               IPA_CMD_ASS_START);
        if (rc) {
-               PRINT_WARN("Could not enable passthrough "
-                          "on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Enabling the passthrough mode for %s failed\n",
+                       QETH_CARD_IFNAME(card));
                return rc;
        }
 out:
-       PRINT_INFO("IPV6 enabled \n");
+       dev_info(&card->gdev->dev, "IPV6 enabled\n");
        return 0;
 }
 #endif
@@ -1373,11 +1278,11 @@ static int qeth_l3_start_ipa_ipv6(struct qeth_card *card)
 {
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 3, "strtipv6");
+       QETH_CARD_TEXT(card, 3, "strtipv6");
 
        if (!qeth_is_supported(card, IPA_IPV6)) {
-               PRINT_WARN("IPv6 not supported on %s\n",
-                          QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "IPv6 not supported on %s\n", QETH_CARD_IFNAME(card));
                return 0;
        }
 #ifdef CONFIG_QETH_IPV6
@@ -1390,37 +1295,38 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "stbrdcst");
+       QETH_CARD_TEXT(card, 3, "stbrdcst");
        card->info.broadcast_capable = 0;
        if (!qeth_is_supported(card, IPA_FILTERING)) {
-               PRINT_WARN("Broadcast not supported on %s\n",
-                          QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "Broadcast not supported on %s\n",
+                       QETH_CARD_IFNAME(card));
                rc = -EOPNOTSUPP;
                goto out;
        }
        rc = qeth_l3_send_simple_setassparms(card, IPA_FILTERING,
                                          IPA_CMD_ASS_START, 0);
        if (rc) {
-               PRINT_WARN("Could not enable broadcasting filtering "
-                          "on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev, "Enabling broadcast filtering for "
+                       "%s failed\n", QETH_CARD_IFNAME(card));
                goto out;
        }
 
        rc = qeth_l3_send_simple_setassparms(card, IPA_FILTERING,
                                          IPA_CMD_ASS_CONFIGURE, 1);
        if (rc) {
-               PRINT_WARN("Could not set up broadcast filtering on %s: 0x%x\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev,
+                       "Setting up broadcast filtering for %s failed\n",
+                       QETH_CARD_IFNAME(card));
                goto out;
        }
        card->info.broadcast_capable = QETH_BROADCAST_WITH_ECHO;
-       PRINT_INFO("Broadcast enabled \n");
+       dev_info(&card->gdev->dev, "Broadcast enabled\n");
        rc = qeth_l3_send_simple_setassparms(card, IPA_FILTERING,
                                          IPA_CMD_ASS_ENABLE, 1);
        if (rc) {
-               PRINT_WARN("Could not set up broadcast echo filtering on "
-                          "%s: 0x%x\n", QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev, "Setting up broadcast echo "
+                       "filtering for %s failed\n", QETH_CARD_IFNAME(card));
                goto out;
        }
        card->info.broadcast_capable = QETH_BROADCAST_WITHOUT_ECHO;
@@ -1439,51 +1345,76 @@ static int qeth_l3_send_checksum_command(struct qeth_card *card)
        rc = qeth_l3_send_simple_setassparms(card, IPA_INBOUND_CHECKSUM,
                                          IPA_CMD_ASS_START, 0);
        if (rc) {
-               PRINT_WARN("Starting Inbound HW Checksumming failed on %s: "
-                          "0x%x,\ncontinuing using Inbound SW Checksumming\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev, "Starting HW checksumming for %s "
+                       "failed, using SW checksumming\n",
+                       QETH_CARD_IFNAME(card));
                return rc;
        }
        rc = qeth_l3_send_simple_setassparms(card, IPA_INBOUND_CHECKSUM,
                                          IPA_CMD_ASS_ENABLE,
                                          card->info.csum_mask);
        if (rc) {
-               PRINT_WARN("Enabling Inbound HW Checksumming failed on %s: "
-                          "0x%x,\ncontinuing using Inbound SW Checksumming\n",
-                          QETH_CARD_IFNAME(card), rc);
+               dev_warn(&card->gdev->dev, "Enabling HW checksumming for %s "
+                       "failed, using SW checksumming\n",
+                       QETH_CARD_IFNAME(card));
                return rc;
        }
        return 0;
 }
 
-static int qeth_l3_start_ipa_checksum(struct qeth_card *card)
+static int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
 {
        int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 3, "strtcsum");
-
-       if (card->options.checksum_type == NO_CHECKSUMMING) {
-               PRINT_WARN("Using no checksumming on %s.\n",
-                          QETH_CARD_IFNAME(card));
-               return 0;
-       }
-       if (card->options.checksum_type == SW_CHECKSUMMING) {
-               PRINT_WARN("Using SW checksumming on %s.\n",
-                          QETH_CARD_IFNAME(card));
-               return 0;
+       if (on) {
+               rc = qeth_l3_send_checksum_command(card);
+               if (rc)
+                       return -EIO;
+               dev_info(&card->gdev->dev,
+                       "HW Checksumming (inbound) enabled\n");
+       } else {
+               rc = qeth_l3_send_simple_setassparms(card,
+                       IPA_INBOUND_CHECKSUM, IPA_CMD_ASS_STOP, 0);
+               if (rc)
+                       return -EIO;
        }
-       if (!qeth_is_supported(card, IPA_INBOUND_CHECKSUM)) {
-               PRINT_WARN("Inbound HW Checksumming not "
-                          "supported on %s,\ncontinuing "
-                          "using Inbound SW Checksumming\n",
-                          QETH_CARD_IFNAME(card));
-               card->options.checksum_type = SW_CHECKSUMMING;
-               return 0;
+
+       return 0;
+}
+
+static int qeth_l3_start_ipa_checksum(struct qeth_card *card)
+{
+       QETH_CARD_TEXT(card, 3, "strtcsum");
+
+       if (card->dev->features & NETIF_F_RXCSUM) {
+               rtnl_lock();
+               /* force set_features call */
+               card->dev->features &= ~NETIF_F_RXCSUM;
+               netdev_update_features(card->dev);
+               rtnl_unlock();
        }
-       rc = qeth_l3_send_checksum_command(card);
-       if (!rc)
-               PRINT_INFO("HW Checksumming (inbound) enabled \n");
+       return 0;
+}
+
+static int qeth_l3_start_ipa_tx_checksum(struct qeth_card *card)
+{
+       int rc = 0;
 
+       if (!qeth_is_supported(card, IPA_OUTBOUND_CHECKSUM))
+               return rc;
+       rc = qeth_l3_send_simple_setassparms(card, IPA_OUTBOUND_CHECKSUM,
+                         IPA_CMD_ASS_START, 0);
+       if (rc)
+               goto err_out;
+       rc = qeth_l3_send_simple_setassparms(card, IPA_OUTBOUND_CHECKSUM,
+                         IPA_CMD_ASS_ENABLE, card->info.tx_csum_mask);
+       if (rc)
+               goto err_out;
+       dev_info(&card->gdev->dev, "HW TX Checksumming enabled\n");
+       return rc;
+err_out:
+       dev_warn(&card->gdev->dev, "Enabling HW TX checksumming for %s "
+               "failed, using SW TX checksumming\n", QETH_CARD_IFNAME(card));
        return rc;
 }
 
@@ -1491,32 +1422,34 @@ static int qeth_l3_start_ipa_tso(struct qeth_card *card)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "sttso");
+       QETH_CARD_TEXT(card, 3, "sttso");
 
        if (!qeth_is_supported(card, IPA_OUTBOUND_TSO)) {
-               PRINT_WARN("Outbound TSO not supported on %s\n",
-                          QETH_CARD_IFNAME(card));
+               dev_info(&card->gdev->dev,
+                       "Outbound TSO not supported on %s\n",
+                       QETH_CARD_IFNAME(card));
                rc = -EOPNOTSUPP;
        } else {
                rc = qeth_l3_send_simple_setassparms(card, IPA_OUTBOUND_TSO,
                                                IPA_CMD_ASS_START, 0);
                if (rc)
-                       PRINT_WARN("Could not start outbound TSO "
-                                  "assist on %s: rc=%i\n",
-                                  QETH_CARD_IFNAME(card), rc);
+                       dev_warn(&card->gdev->dev, "Starting outbound TCP "
+                               "segmentation offload for %s failed\n",
+                               QETH_CARD_IFNAME(card));
                else
-                       PRINT_INFO("Outbound TSO enabled\n");
-       }
-       if (rc && (card->options.large_send == QETH_LARGE_SEND_TSO)) {
-               card->options.large_send = QETH_LARGE_SEND_NO;
-               card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                       dev_info(&card->gdev->dev,
+                               "Outbound TSO enabled\n");
        }
+       if (rc)
+               card->dev->features &= ~NETIF_F_TSO;
        return rc;
 }
 
 static int qeth_l3_start_ipassists(struct qeth_card *card)
 {
-       QETH_DBF_TEXT(TRACE, 3, "strtipas");
+       QETH_CARD_TEXT(card, 3, "strtipas");
+
+       qeth_set_access_ctrl_online(card);      /* go on*/
        qeth_l3_start_ipa_arp_processing(card); /* go on*/
        qeth_l3_start_ipa_ip_fragmentation(card);       /* go on*/
        qeth_l3_start_ipa_source_mac(card);     /* go on*/
@@ -1525,33 +1458,11 @@ static int qeth_l3_start_ipassists(struct qeth_card *card)
        qeth_l3_start_ipa_ipv6(card);           /* go on*/
        qeth_l3_start_ipa_broadcast(card);              /* go on*/
        qeth_l3_start_ipa_checksum(card);               /* go on*/
+       qeth_l3_start_ipa_tx_checksum(card);
        qeth_l3_start_ipa_tso(card);            /* go on*/
        return 0;
 }
 
-static int qeth_l3_put_unique_id(struct qeth_card *card)
-{
-
-       int rc = 0;
-       struct qeth_cmd_buffer *iob;
-       struct qeth_ipa_cmd *cmd;
-
-       QETH_DBF_TEXT(TRACE, 2, "puniqeid");
-
-       if ((card->info.unique_id & UNIQUE_ID_NOT_BY_CARD) ==
-               UNIQUE_ID_NOT_BY_CARD)
-               return -1;
-       iob = qeth_get_ipacmd_buffer(card, IPA_CMD_DESTROY_ADDR,
-                                    QETH_PROT_IPV6);
-       cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
-       *((__u16 *) &cmd->data.create_destroy_addr.unique_id[6]) =
-                               card->info.unique_id;
-       memcpy(&cmd->data.create_destroy_addr.unique_id[0],
-              card->dev->dev_addr, OSA_ADDR_LEN);
-       rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);
-       return rc;
-}
-
 static int qeth_l3_iqd_read_initial_mac_cb(struct qeth_card *card,
                struct qeth_reply *reply, unsigned long data)
 {
@@ -1598,12 +1509,8 @@ static int qeth_l3_get_unique_id_cb(struct qeth_card *card,
        else {
                card->info.unique_id =  UNIQUE_ID_IF_CREATE_ADDR_FAILED |
                                        UNIQUE_ID_NOT_BY_CARD;
-               PRINT_WARN("couldn't get a unique id from the card on device "
-                          "%s (result=x%x), using default id. ipv6 "
-                          "autoconfig on other lpars may lead to duplicate "
-                          "ip addresses. please use manually "
-                          "configured ones.\n",
-                          CARD_BUS_ID(card), cmd->hdr.return_code);
+               dev_warn(&card->gdev->dev, "The network adapter failed to "
+                       "generate a unique ID\n");
        }
        return 0;
 }
@@ -1632,13 +1539,84 @@ static int qeth_l3_get_unique_id(struct qeth_card *card)
        return rc;
 }
 
+static int
+qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply,
+                           unsigned long data)
+{
+       struct qeth_ipa_cmd        *cmd;
+       __u16 rc;
+
+       QETH_DBF_TEXT(SETUP, 2, "diastrcb");
+
+       cmd = (struct qeth_ipa_cmd *)data;
+       rc = cmd->hdr.return_code;
+       if (rc)
+               QETH_CARD_TEXT_(card, 2, "dxter%x", rc);
+       switch (cmd->data.diagass.action) {
+       case QETH_DIAGS_CMD_TRACE_QUERY:
+               break;
+       case QETH_DIAGS_CMD_TRACE_DISABLE:
+               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:
+               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",
+                       cmd->data.diagass.action, QETH_CARD_IFNAME(card));
+       }
+
+       return 0;
+}
+
+static int
+qeth_diags_trace(struct qeth_card *card, enum qeth_diags_trace_cmds diags_cmd)
+{
+       struct qeth_cmd_buffer *iob;
+       struct qeth_ipa_cmd    *cmd;
+
+       QETH_DBF_TEXT(SETUP, 2, "diagtrac");
+
+       iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SET_DIAG_ASS, 0);
+       cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+       cmd->data.diagass.subcmd_len = 16;
+       cmd->data.diagass.subcmd = QETH_DIAGS_CMD_TRACE;
+       cmd->data.diagass.type = QETH_DIAGS_TYPE_HIPERSOCKET;
+       cmd->data.diagass.action = diags_cmd;
+       return qeth_send_ipa_cmd(card, iob, qeth_diags_trace_cb, NULL);
+}
+
 static void qeth_l3_get_mac_for_ipm(__u32 ipm, char *mac,
                                struct net_device *dev)
 {
-       if (dev->type == ARPHRD_IEEE802_TR)
-               ip_tr_mc_map(ipm, mac);
-       else
-               ip_eth_mc_map(ipm, mac);
+       ip_eth_mc_map(ipm, mac);
 }
 
 static void qeth_l3_add_mc(struct qeth_card *card, struct in_device *in4_dev)
@@ -1647,8 +1625,9 @@ static void qeth_l3_add_mc(struct qeth_card *card, struct in_device *in4_dev)
        struct ip_mc_list *im4;
        char buf[MAX_ADDR_LEN];
 
-       QETH_DBF_TEXT(TRACE, 4, "addmc");
-       for (im4 = in4_dev->mc_list; im4; im4 = im4->next) {
+       QETH_CARD_TEXT(card, 4, "addmc");
+       for (im4 = rcu_dereference(in4_dev->mc_list); im4 != NULL;
+            im4 = rcu_dereference(im4->next_rcu)) {
                qeth_l3_get_mac_for_ipm(im4->multiaddr, buf, in4_dev->dev);
                ipm = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
                if (!ipm)
@@ -1664,25 +1643,27 @@ static void qeth_l3_add_mc(struct qeth_card *card, struct in_device *in4_dev)
 static void qeth_l3_add_vlan_mc(struct qeth_card *card)
 {
        struct in_device *in_dev;
-       struct vlan_group *vg;
-       int i;
+       u16 vid;
 
-       QETH_DBF_TEXT(TRACE, 4, "addmcvl");
-       if (!qeth_is_supported(card, IPA_FULL_VLAN) || (card->vlangrp == NULL))
+       QETH_CARD_TEXT(card, 4, "addmcvl");
+       if (!qeth_is_supported(card, IPA_FULL_VLAN))
                return;
 
-       vg = card->vlangrp;
-       for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
-               struct net_device *netdev = vlan_group_get_device(vg, i);
+       for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {
+               struct net_device *netdev;
+
+               rcu_read_lock();
+               netdev = __vlan_find_dev_deep(card->dev, vid);
+               rcu_read_unlock();
                if (netdev == NULL ||
                    !(netdev->flags & IFF_UP))
                        continue;
                in_dev = in_dev_get(netdev);
                if (!in_dev)
                        continue;
-               read_lock(&in_dev->mc_list_lock);
+               rcu_read_lock();
                qeth_l3_add_mc(card, in_dev);
-               read_unlock(&in_dev->mc_list_lock);
+               rcu_read_unlock();
                in_dev_put(in_dev);
        }
 }
@@ -1691,14 +1672,14 @@ static void qeth_l3_add_multicast_ipv4(struct qeth_card *card)
 {
        struct in_device *in4_dev;
 
-       QETH_DBF_TEXT(TRACE, 4, "chkmcv4");
+       QETH_CARD_TEXT(card, 4, "chkmcv4");
        in4_dev = in_dev_get(card->dev);
        if (in4_dev == NULL)
                return;
-       read_lock(&in4_dev->mc_list_lock);
+       rcu_read_lock();
        qeth_l3_add_mc(card, in4_dev);
        qeth_l3_add_vlan_mc(card);
-       read_unlock(&in4_dev->mc_list_lock);
+       rcu_read_unlock();
        in_dev_put(in4_dev);
 }
 
@@ -1709,7 +1690,7 @@ static void qeth_l3_add_mc6(struct qeth_card *card, struct inet6_dev *in6_dev)
        struct ifmcaddr6 *im6;
        char buf[MAX_ADDR_LEN];
 
-       QETH_DBF_TEXT(TRACE, 4, "addmc6");
+       QETH_CARD_TEXT(card, 4, "addmc6");
        for (im6 = in6_dev->mc_list; im6 != NULL; im6 = im6->next) {
                ndisc_mc_map(&im6->mca_addr, buf, in6_dev->dev, 0);
                ipm = qeth_l3_get_addr_buffer(QETH_PROT_IPV6);
@@ -1727,16 +1708,16 @@ static void qeth_l3_add_mc6(struct qeth_card *card, struct inet6_dev *in6_dev)
 static void qeth_l3_add_vlan_mc6(struct qeth_card *card)
 {
        struct inet6_dev *in_dev;
-       struct vlan_group *vg;
-       int i;
+       u16 vid;
 
-       QETH_DBF_TEXT(TRACE, 4, "admc6vl");
-       if (!qeth_is_supported(card, IPA_FULL_VLAN) || (card->vlangrp == NULL))
+       QETH_CARD_TEXT(card, 4, "admc6vl");
+       if (!qeth_is_supported(card, IPA_FULL_VLAN))
                return;
 
-       vg = card->vlangrp;
-       for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
-               struct net_device *netdev = vlan_group_get_device(vg, i);
+       for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {
+               struct net_device *netdev;
+
+               netdev = __vlan_find_dev_deep(card->dev, vid);
                if (netdev == NULL ||
                    !(netdev->flags & IFF_UP))
                        continue;
@@ -1754,7 +1735,7 @@ static void qeth_l3_add_multicast_ipv6(struct qeth_card *card)
 {
        struct inet6_dev *in6_dev;
 
-       QETH_DBF_TEXT(TRACE, 4, "chkmcv6");
+       QETH_CARD_TEXT(card, 4, "chkmcv6");
        if (!qeth_is_supported(card, IPA_IPV6))
                return ;
        in6_dev = in6_dev_get(card->dev);
@@ -1774,10 +1755,12 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card,
        struct in_device *in_dev;
        struct in_ifaddr *ifa;
        struct qeth_ipaddr *addr;
+       struct net_device *netdev;
 
-       QETH_DBF_TEXT(TRACE, 4, "frvaddr4");
+       QETH_CARD_TEXT(card, 4, "frvaddr4");
 
-       in_dev = in_dev_get(vlan_group_get_device(card->vlangrp, vid));
+       netdev = __vlan_find_dev_deep(card->dev, vid);
+       in_dev = in_dev_get(netdev);
        if (!in_dev)
                return;
        for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
@@ -1800,13 +1783,15 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card,
        struct inet6_dev *in6_dev;
        struct inet6_ifaddr *ifa;
        struct qeth_ipaddr *addr;
+       struct net_device *netdev;
 
-       QETH_DBF_TEXT(TRACE, 4, "frvaddr6");
+       QETH_CARD_TEXT(card, 4, "frvaddr6");
 
-       in6_dev = in6_dev_get(vlan_group_get_device(card->vlangrp, vid));
+       netdev = __vlan_find_dev_deep(card->dev, vid);
+       in6_dev = in6_dev_get(netdev);
        if (!in6_dev)
                return;
-       for (ifa = in6_dev->addr_list; ifa; ifa = ifa->lst_next) {
+       list_for_each_entry(ifa, &in6_dev->addr_list, if_list) {
                addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV6);
                if (addr) {
                        memcpy(&addr->u.a6.addr, &ifa->addr,
@@ -1824,72 +1809,45 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card,
 static void qeth_l3_free_vlan_addresses(struct qeth_card *card,
                        unsigned short vid)
 {
-       if (!card->vlangrp)
-               return;
        qeth_l3_free_vlan_addresses4(card, vid);
        qeth_l3_free_vlan_addresses6(card, vid);
 }
 
-static void qeth_l3_vlan_rx_register(struct net_device *dev,
-                       struct vlan_group *grp)
-{
-       struct qeth_card *card = netdev_priv(dev);
-       unsigned long flags;
-
-       QETH_DBF_TEXT(TRACE, 4, "vlanreg");
-       spin_lock_irqsave(&card->vlanlock, flags);
-       card->vlangrp = grp;
-       spin_unlock_irqrestore(&card->vlanlock, flags);
-}
-
-static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
+static int qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
-       struct net_device *vlandev;
-       struct qeth_card *card = (struct qeth_card *) dev->priv;
-       struct in_device *in_dev;
-
-       if (card->info.type == QETH_CARD_TYPE_IQD)
-               return;
-
-       vlandev = vlan_group_get_device(card->vlangrp, vid);
-       vlandev->neigh_setup = qeth_l3_neigh_setup;
-
-       in_dev = in_dev_get(vlandev);
-#ifdef CONFIG_SYSCTL
-       neigh_sysctl_unregister(in_dev->arp_parms);
-#endif
-       neigh_parms_release(&arp_tbl, in_dev->arp_parms);
+       struct qeth_card *card = dev->ml_priv;
 
-       in_dev->arp_parms = neigh_parms_alloc(vlandev, &arp_tbl);
-#ifdef CONFIG_SYSCTL
-       neigh_sysctl_register(vlandev, in_dev->arp_parms, NET_IPV4,
-                             NET_IPV4_NEIGH, "ipv4", NULL, NULL);
-#endif
-       in_dev_put(in_dev);
-       return;
+       set_bit(vid, card->active_vlans);
+       return 0;
 }
 
-static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
-       struct qeth_card *card = netdev_priv(dev);
+       struct qeth_card *card = dev->ml_priv;
        unsigned long flags;
 
-       QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);
+       QETH_CARD_TEXT_(card, 4, "kid:%d", vid);
+       if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
+               QETH_CARD_TEXT(card, 3, "kidREC");
+               return 0;
+       }
        spin_lock_irqsave(&card->vlanlock, flags);
        /* unregister IP addresses of vlan device */
        qeth_l3_free_vlan_addresses(card, vid);
-       vlan_group_set_device(card->vlangrp, vid, NULL);
+       clear_bit(vid, card->active_vlans);
        spin_unlock_irqrestore(&card->vlanlock, flags);
        qeth_l3_set_multicast_list(card->dev);
+       return 0;
 }
 
-static inline __u16 qeth_l3_rebuild_skb(struct qeth_card *card,
-                       struct sk_buff *skb, struct qeth_hdr *hdr)
+static inline int qeth_l3_rebuild_skb(struct qeth_card *card,
+                       struct sk_buff *skb, struct qeth_hdr *hdr,
+                       unsigned short *vlan_id)
 {
-       unsigned short vlan_id = 0;
        __be16 prot;
        struct iphdr *ip_hdr;
        unsigned char tg_addr[MAX_ADDR_LEN];
+       int is_vlan = 0;
 
        if (!(hdr->hdr.l3.flags & QETH_HDR_PASSTHRU)) {
                prot = htons((hdr->hdr.l3.flags & QETH_HDR_IPV6)? ETH_P_IPV6 :
@@ -1906,8 +1864,6 @@ static inline __u16 qeth_l3_rebuild_skb(struct qeth_card *card,
 #endif
                        case __constant_htons(ETH_P_IP):
                                ip_hdr = (struct iphdr *)skb->data;
-                               (card->dev->type == ARPHRD_IEEE802_TR) ?
-                               ip_tr_mc_map(ip_hdr->daddr, tg_addr):
                                ip_eth_mc_map(ip_hdr->daddr, tg_addr);
                                break;
                        default:
@@ -1927,113 +1883,205 @@ static inline __u16 qeth_l3_rebuild_skb(struct qeth_card *card,
                case QETH_CAST_ANYCAST:
                case QETH_CAST_NOCAST:
                default:
-                       skb->pkt_type = PACKET_HOST;
+                       if (card->options.sniffer)
+                               skb->pkt_type = PACKET_OTHERHOST;
+                       else
+                               skb->pkt_type = PACKET_HOST;
                        memcpy(tg_addr, card->dev->dev_addr,
                                card->dev->addr_len);
                }
-               card->dev->header_ops->create(skb, card->dev, prot, tg_addr,
-                                             "FAKELL", card->dev->addr_len);
+               if (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
+                       card->dev->header_ops->create(skb, card->dev, prot,
+                               tg_addr, &hdr->hdr.l3.dest_addr[2],
+                               card->dev->addr_len);
+               else
+                       card->dev->header_ops->create(skb, card->dev, prot,
+                               tg_addr, "FAKELL", card->dev->addr_len);
        }
 
-#ifdef CONFIG_TR
-       if (card->dev->type == ARPHRD_IEEE802_TR)
-               skb->protocol = tr_type_trans(skb, card->dev);
-       else
-#endif
-               skb->protocol = eth_type_trans(skb, card->dev);
+       skb->protocol = eth_type_trans(skb, card->dev);
 
        if (hdr->hdr.l3.ext_flags &
            (QETH_HDR_EXT_VLAN_FRAME | QETH_HDR_EXT_INCLUDE_VLAN_TAG)) {
-               vlan_id = (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_VLAN_FRAME)?
+               *vlan_id = (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_VLAN_FRAME) ?
                 hdr->hdr.l3.vlan_id : *((u16 *)&hdr->hdr.l3.dest_addr[12]);
+               is_vlan = 1;
        }
 
-       skb->ip_summed = card->options.checksum_type;
-       if (card->options.checksum_type == HW_CHECKSUMMING) {
+       if (card->dev->features & NETIF_F_RXCSUM) {
                if ((hdr->hdr.l3.ext_flags &
-                     (QETH_HDR_EXT_CSUM_HDR_REQ |
-                      QETH_HDR_EXT_CSUM_TRANSP_REQ)) ==
-                    (QETH_HDR_EXT_CSUM_HDR_REQ |
-                     QETH_HDR_EXT_CSUM_TRANSP_REQ))
+                   (QETH_HDR_EXT_CSUM_HDR_REQ |
+                    QETH_HDR_EXT_CSUM_TRANSP_REQ)) ==
+                   (QETH_HDR_EXT_CSUM_HDR_REQ |
+                    QETH_HDR_EXT_CSUM_TRANSP_REQ))
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
-                       skb->ip_summed = SW_CHECKSUMMING;
-       }
+                       skb->ip_summed = CHECKSUM_NONE;
+       } else
+               skb->ip_summed = CHECKSUM_NONE;
 
-       return vlan_id;
+       return is_vlan;
 }
 
-static void qeth_l3_process_inbound_buffer(struct qeth_card *card,
-                           struct qeth_qdio_buffer *buf, int index)
+static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
+                               int budget, int *done)
 {
-       struct qdio_buffer_element *element;
+       int work_done = 0;
        struct sk_buff *skb;
        struct qeth_hdr *hdr;
-       int offset;
        __u16 vlan_tag = 0;
+       int is_vlan;
        unsigned int len;
-
-       /* get first element of current buffer */
-       element = (struct qdio_buffer_element *)&buf->buffer->element[0];
-       offset = 0;
-       if (card->options.performance_stats)
-               card->perf_stats.bufs_rec++;
-       while ((skb = qeth_core_get_next_skb(card, buf->buffer, &element,
-                                      &offset, &hdr))) {
-               skb->dev = card->dev;
-               /* is device UP ? */
-               if (!(card->dev->flags & IFF_UP)) {
-                       dev_kfree_skb_any(skb);
-                       continue;
+       __u16 magic;
+
+       *done = 0;
+       BUG_ON(!budget);
+       while (budget) {
+               skb = qeth_core_get_next_skb(card,
+                       &card->qdio.in_q->bufs[card->rx.b_index],
+                       &card->rx.b_element, &card->rx.e_offset, &hdr);
+               if (!skb) {
+                       *done = 1;
+                       break;
                }
-
+               skb->dev = card->dev;
                switch (hdr->hdr.l3.id) {
                case QETH_HEADER_TYPE_LAYER3:
-                       vlan_tag = qeth_l3_rebuild_skb(card, skb, hdr);
+                       magic = *(__u16 *)skb->data;
+                       if ((card->info.type == QETH_CARD_TYPE_IQD) &&
+                           (magic == ETH_P_AF_IUCV)) {
+                               skb->protocol = ETH_P_AF_IUCV;
+                               skb->pkt_type = PACKET_HOST;
+                               skb->mac_header = NET_SKB_PAD;
+                               skb->dev = card->dev;
+                               len = skb->len;
+                               card->dev->header_ops->create(skb, card->dev, 0,
+                                       card->dev->dev_addr, "FAKELL",
+                                       card->dev->addr_len);
+                               netif_receive_skb(skb);
+                       } else {
+                               is_vlan = qeth_l3_rebuild_skb(card, skb, hdr,
+                                                     &vlan_tag);
+                               len = skb->len;
+                               if (is_vlan && !card->options.sniffer)
+                                       __vlan_hwaccel_put_tag(skb, vlan_tag);
+                               napi_gro_receive(&card->napi, skb);
+                       }
+                       break;
+               case QETH_HEADER_TYPE_LAYER2: /* for HiperSockets sniffer */
+                       skb->pkt_type = PACKET_HOST;
+                       skb->protocol = eth_type_trans(skb, skb->dev);
                        len = skb->len;
-                       if (vlan_tag)
-                               if (card->vlangrp)
-                                       vlan_hwaccel_rx(skb, card->vlangrp,
-                                               vlan_tag);
-                               else {
-                                       dev_kfree_skb_any(skb);
-                                       continue;
-                               }
-                       else
-                               netif_rx(skb);
+                       netif_receive_skb(skb);
                        break;
                default:
                        dev_kfree_skb_any(skb);
-                       QETH_DBF_TEXT(TRACE, 3, "inbunkno");
+                       QETH_CARD_TEXT(card, 3, "inbunkno");
                        QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);
                        continue;
                }
-
-               card->dev->last_rx = jiffies;
+               work_done++;
+               budget--;
                card->stats.rx_packets++;
                card->stats.rx_bytes += len;
        }
+       return work_done;
+}
+
+static int qeth_l3_poll(struct napi_struct *napi, int budget)
+{
+       struct qeth_card *card = container_of(napi, struct qeth_card, napi);
+       int work_done = 0;
+       struct qeth_qdio_buffer *buffer;
+       int done;
+       int new_budget = budget;
+
+       if (card->options.performance_stats) {
+               card->perf_stats.inbound_cnt++;
+               card->perf_stats.inbound_start_time = qeth_get_micros();
+       }
+
+       while (1) {
+               if (!card->rx.b_count) {
+                       card->rx.qdio_err = 0;
+                       card->rx.b_count = qdio_get_next_buffers(
+                               card->data.ccwdev, 0, &card->rx.b_index,
+                               &card->rx.qdio_err);
+                       if (card->rx.b_count <= 0) {
+                               card->rx.b_count = 0;
+                               break;
+                       }
+                       card->rx.b_element =
+                               &card->qdio.in_q->bufs[card->rx.b_index]
+                               .buffer->element[0];
+                       card->rx.e_offset = 0;
+               }
+
+               while (card->rx.b_count) {
+                       buffer = &card->qdio.in_q->bufs[card->rx.b_index];
+                       if (!(card->rx.qdio_err &&
+                           qeth_check_qdio_errors(card, buffer->buffer,
+                           card->rx.qdio_err, "qinerr")))
+                               work_done += qeth_l3_process_inbound_buffer(
+                                       card, new_budget, &done);
+                       else
+                               done = 1;
+
+                       if (done) {
+                               if (card->options.performance_stats)
+                                       card->perf_stats.bufs_rec++;
+                               qeth_put_buffer_pool_entry(card,
+                                       buffer->pool_entry);
+                               qeth_queue_input_buffer(card, card->rx.b_index);
+                               card->rx.b_count--;
+                               if (card->rx.b_count) {
+                                       card->rx.b_index =
+                                               (card->rx.b_index + 1) %
+                                               QDIO_MAX_BUFFERS_PER_Q;
+                                       card->rx.b_element =
+                                               &card->qdio.in_q
+                                               ->bufs[card->rx.b_index]
+                                               .buffer->element[0];
+                                       card->rx.e_offset = 0;
+                               }
+                       }
+
+                       if (work_done >= budget)
+                               goto out;
+                       else
+                               new_budget = budget - work_done;
+               }
+       }
+
+       napi_complete(napi);
+       if (qdio_start_irq(card->data.ccwdev, 0))
+               napi_schedule(&card->napi);
+out:
+       if (card->options.performance_stats)
+               card->perf_stats.inbound_time += qeth_get_micros() -
+                       card->perf_stats.inbound_start_time;
+       return work_done;
 }
 
 static int qeth_l3_verify_vlan_dev(struct net_device *dev,
                        struct qeth_card *card)
 {
        int rc = 0;
-       struct vlan_group *vg;
-       int i;
+       u16 vid;
 
-       vg = card->vlangrp;
-       if (!vg)
-               return rc;
+       for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) {
+               struct net_device *netdev;
 
-       for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
-               if (vlan_group_get_device(vg, i) == dev) {
+               rcu_read_lock();
+               netdev = __vlan_find_dev_deep(card->dev, vid);
+               rcu_read_unlock();
+               if (netdev == dev) {
                        rc = QETH_VLAN_CARD;
                        break;
                }
        }
 
-       if (rc && !(netdev_priv(vlan_dev_info(dev)->real_dev) == (void *)card))
+       if (rc && !(vlan_dev_real_dev(dev)->ml_priv == (void *)card))
                return 0;
 
        return rc;
@@ -2067,12 +2115,13 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
 
        rc = qeth_l3_verify_dev(dev);
        if (rc == QETH_REAL_CARD)
-               card = netdev_priv(dev);
+               card = dev->ml_priv;
        else if (rc == QETH_VLAN_CARD)
-               card = netdev_priv(vlan_dev_info(dev)->real_dev);
-       if (card->options.layer2)
+               card = vlan_dev_real_dev(dev)->ml_priv;
+       if (card && card->options.layer2)
                card = NULL;
-       QETH_DBF_TEXT_(TRACE, 4, "%d", rc);
+       if (card)
+               QETH_CARD_TEXT_(card, 4, "%d", rc);
        return card ;
 }
 
@@ -2084,32 +2133,27 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
        qeth_set_allowed_threads(card, 0, 1);
-       if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-               return -ERESTARTSYS;
+       if (card->options.sniffer &&
+           (card->info.promisc_mode == SET_PROMISC_MODE_ON))
+               qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_DISABLE);
        if (card->read.state == CH_STATE_UP &&
            card->write.state == CH_STATE_UP &&
            (card->state == CARD_STATE_UP)) {
                if (recovery_mode)
                        qeth_l3_stop(card->dev);
-               if (!card->use_hard_stop) {
-                       rc = qeth_send_stoplan(card);
-                       if (rc)
-                               QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
+               else {
+                       rtnl_lock();
+                       dev_close(card->dev);
+                       rtnl_unlock();
                }
                card->state = CARD_STATE_SOFTSETUP;
        }
        if (card->state == CARD_STATE_SOFTSETUP) {
-               qeth_l3_clear_ip_list(card, !card->use_hard_stop, 1);
+               qeth_l3_clear_ip_list(card, 1);
                qeth_clear_ipacmd_list(card);
                card->state = CARD_STATE_HARDSETUP;
        }
        if (card->state == CARD_STATE_HARDSETUP) {
-               if (!card->use_hard_stop &&
-                   (card->info.type != QETH_CARD_TYPE_IQD)) {
-                       rc = qeth_l3_put_unique_id(card);
-                       if (rc)
-                               QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);
-               }
                qeth_qdio_clear_card(card, 0);
                qeth_clear_qdio_buffers(card);
                qeth_clear_working_pool_list(card);
@@ -2119,24 +2163,58 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
                qeth_clear_cmd_buffers(&card->read);
                qeth_clear_cmd_buffers(&card->write);
        }
-       card->use_hard_stop = 0;
        return rc;
 }
 
+/*
+ * test for and Switch promiscuous mode (on or off)
+ *  either for guestlan or HiperSocket Sniffer
+ */
+static void
+qeth_l3_handle_promisc_mode(struct qeth_card *card)
+{
+       struct net_device *dev = card->dev;
+
+       if (((dev->flags & IFF_PROMISC) &&
+            (card->info.promisc_mode == SET_PROMISC_MODE_ON)) ||
+           (!(dev->flags & IFF_PROMISC) &&
+            (card->info.promisc_mode == SET_PROMISC_MODE_OFF)))
+               return;
+
+       if (card->info.guestlan) {              /* Guestlan trace */
+               if (qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
+                       qeth_setadp_promisc_mode(card);
+       } else if (card->options.sniffer &&     /* HiperSockets trace */
+                  qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST)) {
+               if (dev->flags & IFF_PROMISC) {
+                       QETH_CARD_TEXT(card, 3, "+promisc");
+                       qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_ENABLE);
+               } else {
+                       QETH_CARD_TEXT(card, 3, "-promisc");
+                       qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_DISABLE);
+               }
+       }
+}
+
 static void qeth_l3_set_multicast_list(struct net_device *dev)
 {
-       struct qeth_card *card = netdev_priv(dev);
+       struct qeth_card *card = dev->ml_priv;
 
-       QETH_DBF_TEXT(TRACE, 3, "setmulti");
-       qeth_l3_delete_mc_addresses(card);
-       qeth_l3_add_multicast_ipv4(card);
+       QETH_CARD_TEXT(card, 3, "setmulti");
+       if (qeth_threads_running(card, QETH_RECOVER_THREAD) &&
+           (card->state != CARD_STATE_UP))
+               return;
+       if (!card->options.sniffer) {
+               qeth_l3_delete_mc_addresses(card);
+               qeth_l3_add_multicast_ipv4(card);
 #ifdef CONFIG_QETH_IPV6
-       qeth_l3_add_multicast_ipv6(card);
+               qeth_l3_add_multicast_ipv6(card);
 #endif
-       qeth_l3_set_ip_addr_list(card);
-       if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
-               return;
-       qeth_setadp_promisc_mode(card);
+               qeth_l3_set_ip_addr_list(card);
+               if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
+                       return;
+       }
+       qeth_l3_handle_promisc_mode(card);
 }
 
 static const char *qeth_l3_arp_get_error_cause(int *rc)
@@ -2167,7 +2245,7 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries)
        int tmp;
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "arpstnoe");
+       QETH_CARD_TEXT(card, 3, "arpstnoe");
 
        /*
         * currently GuestLAN only supports the ARP assist function
@@ -2177,8 +2255,6 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries)
        if (card->info.guestlan)
                return -EOPNOTSUPP;
        if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
-               PRINT_WARN("ARP processing not supported "
-                          "on %s!\n", QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
        rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING,
@@ -2186,29 +2262,53 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries)
                                          no_entries);
        if (rc) {
                tmp = rc;
-               PRINT_WARN("Could not set number of ARP entries on %s: "
-                       "%s (0x%x/%d)\n", QETH_CARD_IFNAME(card),
+               QETH_DBF_MESSAGE(2, "Could not set number of ARP entries on "
+                       "%s: %s (0x%x/%d)\n", QETH_CARD_IFNAME(card),
                        qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
        }
        return rc;
 }
 
-static void qeth_l3_copy_arp_entries_stripped(struct qeth_arp_query_info *qinfo,
-               struct qeth_arp_query_data *qdata, int entry_size,
-               int uentry_size)
+static __u32 get_arp_entry_size(struct qeth_card *card,
+                       struct qeth_arp_query_data *qdata,
+                       struct qeth_arp_entrytype *type, __u8 strip_entries)
 {
-       char *entry_ptr;
-       char *uentry_ptr;
-       int i;
+       __u32 rc;
+       __u8 is_hsi;
 
-       entry_ptr = (char *)&qdata->data;
-       uentry_ptr = (char *)(qinfo->udata + qinfo->udata_offset);
-       for (i = 0; i < qdata->no_entries; ++i) {
-               /* strip off 32 bytes "media specific information" */
-               memcpy(uentry_ptr, (entry_ptr + 32), entry_size - 32);
-               entry_ptr += entry_size;
-               uentry_ptr += uentry_size;
+       is_hsi = qdata->reply_bits == 5;
+       if (type->ip == QETHARP_IP_ADDR_V4) {
+               QETH_CARD_TEXT(card, 4, "arpev4");
+               if (strip_entries) {
+                       rc = is_hsi ? sizeof(struct qeth_arp_qi_entry5_short) :
+                               sizeof(struct qeth_arp_qi_entry7_short);
+               } else {
+                       rc = is_hsi ? sizeof(struct qeth_arp_qi_entry5) :
+                               sizeof(struct qeth_arp_qi_entry7);
+               }
+       } else if (type->ip == QETHARP_IP_ADDR_V6) {
+               QETH_CARD_TEXT(card, 4, "arpev6");
+               if (strip_entries) {
+                       rc = is_hsi ?
+                               sizeof(struct qeth_arp_qi_entry5_short_ipv6) :
+                               sizeof(struct qeth_arp_qi_entry7_short_ipv6);
+               } else {
+                       rc = is_hsi ?
+                               sizeof(struct qeth_arp_qi_entry5_ipv6) :
+                               sizeof(struct qeth_arp_qi_entry7_ipv6);
+               }
+       } else {
+               QETH_CARD_TEXT(card, 4, "arpinv");
+               rc = 0;
        }
+
+       return rc;
+}
+
+static int arpentry_matches_prot(struct qeth_arp_entrytype *type, __u16 prot)
+{
+       return (type->ip == QETHARP_IP_ADDR_V4 && prot == QETH_PROT_IPV4) ||
+               (type->ip == QETHARP_IP_ADDR_V6 && prot == QETH_PROT_IPV6);
 }
 
 static int qeth_l3_arp_query_cb(struct qeth_card *card,
@@ -2217,75 +2317,77 @@ static int qeth_l3_arp_query_cb(struct qeth_card *card,
        struct qeth_ipa_cmd *cmd;
        struct qeth_arp_query_data *qdata;
        struct qeth_arp_query_info *qinfo;
-       int entry_size;
-       int uentry_size;
        int i;
+       int e;
+       int entrybytes_done;
+       int stripped_bytes;
+       __u8 do_strip_entries;
 
-       QETH_DBF_TEXT(TRACE, 4, "arpquecb");
+       QETH_CARD_TEXT(card, 3, "arpquecb");
 
        qinfo = (struct qeth_arp_query_info *) reply->param;
        cmd = (struct qeth_ipa_cmd *) data;
+       QETH_CARD_TEXT_(card, 4, "%i", cmd->hdr.prot_version);
        if (cmd->hdr.return_code) {
-               QETH_DBF_TEXT_(TRACE, 4, "qaer1%i", cmd->hdr.return_code);
+               QETH_CARD_TEXT(card, 4, "arpcberr");
+               QETH_CARD_TEXT_(card, 4, "%i", cmd->hdr.return_code);
                return 0;
        }
        if (cmd->data.setassparms.hdr.return_code) {
                cmd->hdr.return_code = cmd->data.setassparms.hdr.return_code;
-               QETH_DBF_TEXT_(TRACE, 4, "qaer2%i", cmd->hdr.return_code);
+               QETH_CARD_TEXT(card, 4, "setaperr");
+               QETH_CARD_TEXT_(card, 4, "%i", cmd->hdr.return_code);
                return 0;
        }
        qdata = &cmd->data.setassparms.data.query_arp;
-       switch (qdata->reply_bits) {
-       case 5:
-               uentry_size = entry_size = sizeof(struct qeth_arp_qi_entry5);
-               if (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES)
-                       uentry_size = sizeof(struct qeth_arp_qi_entry5_short);
-               break;
-       case 7:
-               /* fall through to default */
-       default:
-               /* tr is the same as eth -> entry7 */
-               uentry_size = entry_size = sizeof(struct qeth_arp_qi_entry7);
-               if (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES)
-                       uentry_size = sizeof(struct qeth_arp_qi_entry7_short);
-               break;
-       }
-       /* check if there is enough room in userspace */
-       if ((qinfo->udata_len - qinfo->udata_offset) <
-                       qdata->no_entries * uentry_size){
-               QETH_DBF_TEXT_(TRACE, 4, "qaer3%i", -ENOMEM);
-               cmd->hdr.return_code = -ENOMEM;
-               PRINT_WARN("query ARP user space buffer is too small for "
-                          "the returned number of ARP entries. "
-                          "Aborting query!\n");
-               goto out_error;
-       }
-       QETH_DBF_TEXT_(TRACE, 4, "anore%i",
-                      cmd->data.setassparms.hdr.number_of_replies);
-       QETH_DBF_TEXT_(TRACE, 4, "aseqn%i", cmd->data.setassparms.hdr.seq_no);
-       QETH_DBF_TEXT_(TRACE, 4, "anoen%i", qdata->no_entries);
-
-       if (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES) {
-               /* strip off "media specific information" */
-               qeth_l3_copy_arp_entries_stripped(qinfo, qdata, entry_size,
-                                              uentry_size);
-       } else
-               /*copy entries to user buffer*/
-               memcpy(qinfo->udata + qinfo->udata_offset,
-                      (char *)&qdata->data, qdata->no_entries*uentry_size);
+       QETH_CARD_TEXT_(card, 4, "anoen%i", qdata->no_entries);
+
+       do_strip_entries = (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES) > 0;
+       stripped_bytes = do_strip_entries ? QETH_QARP_MEDIASPECIFIC_BYTES : 0;
+       entrybytes_done = 0;
+       for (e = 0; e < qdata->no_entries; ++e) {
+               char *cur_entry;
+               __u32 esize;
+               struct qeth_arp_entrytype *etype;
+
+               cur_entry = &qdata->data + entrybytes_done;
+               etype = &((struct qeth_arp_qi_entry5 *) cur_entry)->type;
+               if (!arpentry_matches_prot(etype, cmd->hdr.prot_version)) {
+                       QETH_CARD_TEXT(card, 4, "pmis");
+                       QETH_CARD_TEXT_(card, 4, "%i", etype->ip);
+                       break;
+               }
+               esize = get_arp_entry_size(card, qdata, etype,
+                       do_strip_entries);
+               QETH_CARD_TEXT_(card, 5, "esz%i", esize);
+               if (!esize)
+                       break;
+
+               if ((qinfo->udata_len - qinfo->udata_offset) < esize) {
+                       QETH_CARD_TEXT_(card, 4, "qaer3%i", -ENOMEM);
+                       cmd->hdr.return_code = IPA_RC_ENOMEM;
+                       goto out_error;
+               }
 
-       qinfo->no_entries += qdata->no_entries;
-       qinfo->udata_offset += (qdata->no_entries*uentry_size);
+               memcpy(qinfo->udata + qinfo->udata_offset,
+                       &qdata->data + entrybytes_done + stripped_bytes,
+                       esize);
+               entrybytes_done += esize + stripped_bytes;
+               qinfo->udata_offset += esize;
+               ++qinfo->no_entries;
+       }
        /* check if all replies received ... */
        if (cmd->data.setassparms.hdr.seq_no <
            cmd->data.setassparms.hdr.number_of_replies)
                return 1;
+       QETH_CARD_TEXT_(card, 4, "nove%i", qinfo->no_entries);
        memcpy(qinfo->udata, &qinfo->no_entries, 4);
        /* keep STRIP_ENTRIES flag so the user program can distinguish
         * stripped entries from normal ones */
        if (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES)
                qdata->reply_bits |= QETH_QARP_STRIP_ENTRIES;
        memcpy(qinfo->udata + QETH_QARP_MASK_OFFSET, &qdata->reply_bits, 2);
+       QETH_CARD_TEXT_(card, 4, "rc%i", 0);
        return 0;
 out_error:
        i = 0;
@@ -2299,7 +2401,7 @@ static int qeth_l3_send_ipa_arp_cmd(struct qeth_card *card,
                        unsigned long),
                void *reply_param)
 {
-       QETH_DBF_TEXT(TRACE, 4, "sendarp");
+       QETH_CARD_TEXT(card, 4, "sendarp");
 
        memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE);
        memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data),
@@ -2308,47 +2410,86 @@ static int qeth_l3_send_ipa_arp_cmd(struct qeth_card *card,
                                      reply_cb, reply_param);
 }
 
-static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata)
+static int qeth_l3_query_arp_cache_info(struct qeth_card *card,
+       enum qeth_prot_versions prot,
+       struct qeth_arp_query_info *qinfo)
 {
        struct qeth_cmd_buffer *iob;
-       struct qeth_arp_query_info qinfo = {0, };
+       struct qeth_ipa_cmd *cmd;
        int tmp;
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "arpquery");
+       QETH_CARD_TEXT_(card, 3, "qarpipv%i", prot);
+
+       iob = qeth_l3_get_setassparms_cmd(card, IPA_ARP_PROCESSING,
+                       IPA_CMD_ASS_ARP_QUERY_INFO,
+                       sizeof(struct qeth_arp_query_data) - sizeof(char),
+                       prot);
+       cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+       cmd->data.setassparms.data.query_arp.request_bits = 0x000F;
+       cmd->data.setassparms.data.query_arp.reply_bits = 0;
+       cmd->data.setassparms.data.query_arp.no_entries = 0;
+       rc = qeth_l3_send_ipa_arp_cmd(card, iob,
+                          QETH_SETASS_BASE_LEN+QETH_ARP_CMD_LEN,
+                          qeth_l3_arp_query_cb, (void *)qinfo);
+       if (rc) {
+               tmp = rc;
+               QETH_DBF_MESSAGE(2,
+                       "Error while querying ARP cache on %s: %s "
+                       "(0x%x/%d)\n", QETH_CARD_IFNAME(card),
+                       qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
+       }
+
+       return rc;
+}
+
+static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata)
+{
+       struct qeth_arp_query_info qinfo = {0, };
+       int rc;
+
+       QETH_CARD_TEXT(card, 3, "arpquery");
 
        if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/
                               IPA_ARP_PROCESSING)) {
-               PRINT_WARN("ARP processing not supported "
-                          "on %s!\n", QETH_CARD_IFNAME(card));
-               return -EOPNOTSUPP;
+               QETH_CARD_TEXT(card, 3, "arpqnsup");
+               rc = -EOPNOTSUPP;
+               goto out;
        }
        /* get size of userspace buffer and mask_bits -> 6 bytes */
-       if (copy_from_user(&qinfo, udata, 6))
-               return -EFAULT;
+       if (copy_from_user(&qinfo, udata, 6)) {
+               rc = -EFAULT;
+               goto out;
+       }
        qinfo.udata = kzalloc(qinfo.udata_len, GFP_KERNEL);
-       if (!qinfo.udata)
-               return -ENOMEM;
+       if (!qinfo.udata) {
+               rc = -ENOMEM;
+               goto out;
+       }
        qinfo.udata_offset = QETH_QARP_ENTRIES_OFFSET;
-       iob = qeth_l3_get_setassparms_cmd(card, IPA_ARP_PROCESSING,
-                                      IPA_CMD_ASS_ARP_QUERY_INFO,
-                                      sizeof(int), QETH_PROT_IPV4);
-
-       rc = qeth_l3_send_ipa_arp_cmd(card, iob,
-                                  QETH_SETASS_BASE_LEN+QETH_ARP_CMD_LEN,
-                                  qeth_l3_arp_query_cb, (void *)&qinfo);
+       rc = qeth_l3_query_arp_cache_info(card, QETH_PROT_IPV4, &qinfo);
        if (rc) {
-               tmp = rc;
-               PRINT_WARN("Error while querying ARP cache on %s: %s "
-                       "(0x%x/%d)\n", QETH_CARD_IFNAME(card),
-                       qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
                if (copy_to_user(udata, qinfo.udata, 4))
                        rc = -EFAULT;
+                       goto free_and_out;
        } else {
-               if (copy_to_user(udata, qinfo.udata, qinfo.udata_len))
+#ifdef CONFIG_QETH_IPV6
+               if (qinfo.mask_bits & QETH_QARP_WITH_IPV6) {
+                       /* fails in case of GuestLAN QDIO mode */
+                       qeth_l3_query_arp_cache_info(card, QETH_PROT_IPV6,
+                               &qinfo);
+               }
+#endif
+               if (copy_to_user(udata, qinfo.udata, qinfo.udata_len)) {
+                       QETH_CARD_TEXT(card, 4, "qactf");
                        rc = -EFAULT;
+                       goto free_and_out;
+               }
+               QETH_CARD_TEXT_(card, 4, "qacts");
        }
+free_and_out:
        kfree(qinfo.udata);
+out:
        return rc;
 }
 
@@ -2360,7 +2501,7 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card,
        int tmp;
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "arpadent");
+       QETH_CARD_TEXT(card, 3, "arpadent");
 
        /*
         * currently GuestLAN only supports the ARP assist function
@@ -2370,8 +2511,6 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card,
        if (card->info.guestlan)
                return -EOPNOTSUPP;
        if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
-               PRINT_WARN("ARP processing not supported "
-                          "on %s!\n", QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
 
@@ -2386,10 +2525,9 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card,
        if (rc) {
                tmp = rc;
                qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf);
-               PRINT_WARN("Could not add ARP entry for address %s on %s: "
-                          "%s (0x%x/%d)\n",
-                          buf, QETH_CARD_IFNAME(card),
-                          qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
+               QETH_DBF_MESSAGE(2, "Could not add ARP entry for address %s "
+                       "on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card),
+                       qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
        }
        return rc;
 }
@@ -2402,7 +2540,7 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card,
        int tmp;
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 3, "arprment");
+       QETH_CARD_TEXT(card, 3, "arprment");
 
        /*
         * currently GuestLAN only supports the ARP assist function
@@ -2412,8 +2550,6 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card,
        if (card->info.guestlan)
                return -EOPNOTSUPP;
        if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
-               PRINT_WARN("ARP processing not supported "
-                          "on %s!\n", QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
        memcpy(buf, entry, 12);
@@ -2428,10 +2564,9 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card,
                tmp = rc;
                memset(buf, 0, 16);
                qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf);
-               PRINT_WARN("Could not delete ARP entry for address %s on %s: "
-                          "%s (0x%x/%d)\n",
-                          buf, QETH_CARD_IFNAME(card),
-                          qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
+               QETH_DBF_MESSAGE(2, "Could not delete ARP entry for address %s"
+                       " on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card),
+                       qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
        }
        return rc;
 }
@@ -2441,7 +2576,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)
        int rc;
        int tmp;
 
-       QETH_DBF_TEXT(TRACE, 3, "arpflush");
+       QETH_CARD_TEXT(card, 3, "arpflush");
 
        /*
         * currently GuestLAN only supports the ARP assist function
@@ -2451,16 +2586,14 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)
        if (card->info.guestlan || (card->info.type == QETH_CARD_TYPE_IQD))
                return -EOPNOTSUPP;
        if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
-               PRINT_WARN("ARP processing not supported "
-                          "on %s!\n", QETH_CARD_IFNAME(card));
                return -EOPNOTSUPP;
        }
        rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING,
                                          IPA_CMD_ASS_ARP_FLUSH_CACHE, 0);
        if (rc) {
                tmp = rc;
-               PRINT_WARN("Could not flush ARP cache on %s: %s (0x%x/%d)\n",
-                       QETH_CARD_IFNAME(card),
+               QETH_DBF_MESSAGE(2, "Could not flush ARP cache on %s: %s "
+                       "(0x%x/%d)\n", QETH_CARD_IFNAME(card),
                        qeth_l3_arp_get_error_cause(&rc), tmp, tmp);
        }
        return rc;
@@ -2468,7 +2601,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)
 
 static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-       struct qeth_card *card = netdev_priv(dev);
+       struct qeth_card *card = dev->ml_priv;
        struct qeth_arp_cache_entry arp_entry;
        struct mii_ioctl_data *mii_data;
        int rc = 0;
@@ -2528,7 +2661,8 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data);
                break;
        case SIOC_QETH_GET_CARD_TYPE:
-               if ((card->info.type == QETH_CARD_TYPE_OSAE) &&
+               if ((card->info.type == QETH_CARD_TYPE_OSD ||
+                    card->info.type == QETH_CARD_TYPE_OSX) &&
                    !card->info.guestlan)
                        return 1;
                return 0;
@@ -2546,17 +2680,100 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                                        mii_data->phy_id,
                                                        mii_data->reg_num);
                break;
+       case SIOC_QETH_QUERY_OAT:
+               rc = qeth_query_oat_command(card, rq->ifr_ifru.ifru_data);
+               break;
        default:
                rc = -EOPNOTSUPP;
        }
        if (rc)
-               QETH_DBF_TEXT_(TRACE, 2, "ioce%d", rc);
+               QETH_CARD_TEXT_(card, 2, "ioce%d", rc);
        return rc;
 }
 
+int inline qeth_l3_get_cast_type(struct qeth_card *card, struct sk_buff *skb)
+{
+       int cast_type = RTN_UNSPEC;
+       struct neighbour *n = NULL;
+       struct dst_entry *dst;
+
+       rcu_read_lock();
+       dst = skb_dst(skb);
+       if (dst)
+               n = dst_get_neighbour_noref(dst);
+       if (n) {
+               cast_type = n->type;
+               rcu_read_unlock();
+               if ((cast_type == RTN_BROADCAST) ||
+                   (cast_type == RTN_MULTICAST) ||
+                   (cast_type == RTN_ANYCAST))
+                       return cast_type;
+               else
+                       return RTN_UNSPEC;
+       }
+       rcu_read_unlock();
+
+       /* try something else */
+       if (skb->protocol == ETH_P_IPV6)
+               return (skb_network_header(skb)[24] == 0xff) ?
+                               RTN_MULTICAST : 0;
+       else if (skb->protocol == ETH_P_IP)
+               return ((skb_network_header(skb)[16] & 0xf0) == 0xe0) ?
+                               RTN_MULTICAST : 0;
+       /* ... */
+       if (!memcmp(skb->data, skb->dev->broadcast, 6))
+               return RTN_BROADCAST;
+       else {
+               u16 hdr_mac;
+
+               hdr_mac = *((u16 *)skb->data);
+               /* tr multicast? */
+               switch (card->info.link_type) {
+               case QETH_LINK_TYPE_HSTR:
+               case QETH_LINK_TYPE_LANE_TR:
+                       if ((hdr_mac == QETH_TR_MAC_NC) ||
+                           (hdr_mac == QETH_TR_MAC_C))
+                               return RTN_MULTICAST;
+                       break;
+               /* eth or so multicast? */
+               default:
+               if ((hdr_mac == QETH_ETH_MAC_V4) ||
+                           (hdr_mac == QETH_ETH_MAC_V6))
+                               return RTN_MULTICAST;
+               }
+       }
+       return cast_type;
+}
+
+static void qeth_l3_fill_af_iucv_hdr(struct qeth_card *card,
+               struct qeth_hdr *hdr, struct sk_buff *skb)
+{
+       char daddr[16];
+       struct af_iucv_trans_hdr *iucv_hdr;
+
+       skb_pull(skb, 14);
+       card->dev->header_ops->create(skb, card->dev, 0,
+                                     card->dev->dev_addr, card->dev->dev_addr,
+                                     card->dev->addr_len);
+       skb_pull(skb, 14);
+       iucv_hdr = (struct af_iucv_trans_hdr *)skb->data;
+       memset(hdr, 0, sizeof(struct qeth_hdr));
+       hdr->hdr.l3.id = QETH_HEADER_TYPE_LAYER3;
+       hdr->hdr.l3.ext_flags = 0;
+       hdr->hdr.l3.length = skb->len;
+       hdr->hdr.l3.flags = QETH_HDR_IPV6 | QETH_CAST_UNICAST;
+       memset(daddr, 0, sizeof(daddr));
+       daddr[0] = 0xfe;
+       daddr[1] = 0x80;
+       memcpy(&daddr[8], iucv_hdr->destUserID, 8);
+       memcpy(hdr->hdr.l3.dest_addr, daddr, 16);
+}
+
 static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                struct sk_buff *skb, int ipv, int cast_type)
 {
+       struct dst_entry *dst;
+
        memset(hdr, 0, sizeof(struct qeth_hdr));
        hdr->hdr.l3.id = QETH_HEADER_TYPE_LAYER3;
        hdr->hdr.l3.ext_flags = 0;
@@ -2565,7 +2782,7 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
         * before we're going to overwrite this location with next hop ip.
         * v6 uses passthrough, v4 sets the tag in the QDIO header.
         */
-       if (card->vlangrp && vlan_tx_tag_present(skb)) {
+       if (vlan_tx_tag_present(skb)) {
                if ((ipv == 4) || (card->info.type == QETH_CARD_TYPE_IQD))
                        hdr->hdr.l3.ext_flags = QETH_HDR_EXT_VLAN_FRAME;
                else
@@ -2574,39 +2791,34 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
        }
 
        hdr->hdr.l3.length = skb->len - sizeof(struct qeth_hdr);
+
+       rcu_read_lock();
+       dst = skb_dst(skb);
        if (ipv == 4) {
+               struct rtable *rt = (struct rtable *) dst;
+               __be32 *pkey = &ip_hdr(skb)->daddr;
+
+               if (rt->rt_gateway)
+                       pkey = &rt->rt_gateway;
+
                /* IPv4 */
                hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags4(cast_type);
                memset(hdr->hdr.l3.dest_addr, 0, 12);
-               if ((skb->dst) && (skb->dst->neighbour)) {
-                       *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
-                           *((u32 *) skb->dst->neighbour->primary_key);
-               } else {
-                       /* fill in destination address used in ip header */
-                       *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
-                                                       ip_hdr(skb)->daddr;
-               }
+               *((__be32 *) (&hdr->hdr.l3.dest_addr[12])) = *pkey;
        } else if (ipv == 6) {
+               struct rt6_info *rt = (struct rt6_info *) dst;
+               struct in6_addr *pkey = &ipv6_hdr(skb)->daddr;
+
+               if (!ipv6_addr_any(&rt->rt6i_gateway))
+                       pkey = &rt->rt6i_gateway;
+
                /* IPv6 */
                hdr->hdr.l3.flags = qeth_l3_get_qeth_hdr_flags6(cast_type);
                if (card->info.type == QETH_CARD_TYPE_IQD)
                        hdr->hdr.l3.flags &= ~QETH_HDR_PASSTHRU;
-               if ((skb->dst) && (skb->dst->neighbour)) {
-                       memcpy(hdr->hdr.l3.dest_addr,
-                              skb->dst->neighbour->primary_key, 16);
-               } else {
-                       /* fill in destination address used in ip header */
-                       memcpy(hdr->hdr.l3.dest_addr,
-                              &ipv6_hdr(skb)->daddr, 16);
-               }
+               memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
        } else {
-               /* passthrough */
-               if ((skb->dev->type == ARPHRD_IEEE802_TR) &&
-                       !memcmp(skb->data + sizeof(struct qeth_hdr) +
-                       sizeof(__u16), skb->dev->broadcast, 6)) {
-                       hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
-                                               QETH_HDR_PASSTHRU;
-               } else if (!memcmp(skb->data + sizeof(struct qeth_hdr),
+               if (!memcmp(skb->data + sizeof(struct qeth_hdr),
                            skb->dev->broadcast, 6)) {
                        /* broadcast? */
                        hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
@@ -2617,6 +2829,70 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                                QETH_CAST_UNICAST | QETH_HDR_PASSTHRU;
                }
        }
+       rcu_read_unlock();
+}
+
+static inline void qeth_l3_hdr_csum(struct qeth_card *card,
+               struct qeth_hdr *hdr, struct sk_buff *skb)
+{
+       struct iphdr *iph = ip_hdr(skb);
+
+       /* tcph->check contains already the pseudo hdr checksum
+        * so just set the header flags
+        */
+       if (iph->protocol == IPPROTO_UDP)
+               hdr->hdr.l3.ext_flags |= QETH_HDR_EXT_UDP;
+       hdr->hdr.l3.ext_flags |= QETH_HDR_EXT_CSUM_TRANSP_REQ |
+               QETH_HDR_EXT_CSUM_HDR_REQ;
+       iph->check = 0;
+       if (card->options.performance_stats)
+               card->perf_stats.tx_csum++;
+}
+
+static void qeth_tso_fill_header(struct qeth_card *card,
+               struct qeth_hdr *qhdr, struct sk_buff *skb)
+{
+       struct qeth_hdr_tso *hdr = (struct qeth_hdr_tso *)qhdr;
+       struct tcphdr *tcph = tcp_hdr(skb);
+       struct iphdr *iph = ip_hdr(skb);
+       struct ipv6hdr *ip6h = ipv6_hdr(skb);
+
+       /*fix header to TSO values ...*/
+       hdr->hdr.hdr.l3.id = QETH_HEADER_TYPE_TSO;
+       hdr->hdr.hdr.l3.length = skb->len - sizeof(struct qeth_hdr_tso);
+       /*set values which are fix for the first approach ...*/
+       hdr->ext.hdr_tot_len = (__u16) sizeof(struct qeth_hdr_ext_tso);
+       hdr->ext.imb_hdr_no  = 1;
+       hdr->ext.hdr_type    = 1;
+       hdr->ext.hdr_version = 1;
+       hdr->ext.hdr_len     = 28;
+       /*insert non-fix values */
+       hdr->ext.mss = skb_shinfo(skb)->gso_size;
+       hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
+       hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
+                                      sizeof(struct qeth_hdr_tso));
+       tcph->check = 0;
+       if (skb->protocol == ETH_P_IPV6) {
+               ip6h->payload_len = 0;
+               tcph->check = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
+                                              0, IPPROTO_TCP, 0);
+       } else {
+               /*OSA want us to set these values ...*/
+               tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                        0, IPPROTO_TCP, 0);
+               iph->tot_len = 0;
+               iph->check = 0;
+       }
+}
+
+static inline int qeth_l3_tso_elements(struct sk_buff *skb)
+{
+       unsigned long tcpd = (unsigned long)tcp_hdr(skb) +
+               tcp_hdr(skb)->doff * 4;
+       int tcpd_len = skb->len - (tcpd - (unsigned long)skb->data);
+       int elements = PFN_UP(tcpd + tcpd_len - 1) - PFN_DOWN(tcpd);
+       elements += skb_shinfo(skb)->nr_frags;
+       return elements;
 }
 
 static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -2625,19 +2901,23 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        u16 *tag;
        struct qeth_hdr *hdr = NULL;
        int elements_needed = 0;
-       struct qeth_card *card = netdev_priv(dev);
+       int elems;
+       struct qeth_card *card = dev->ml_priv;
        struct sk_buff *new_skb = NULL;
        int ipv = qeth_get_ip_version(skb);
-       int cast_type = qeth_get_cast_type(card, skb);
+       int cast_type = qeth_l3_get_cast_type(card, skb);
        struct qeth_qdio_out_q *queue = card->qdio.out_qs
                [qeth_get_priority_queue(card, skb, ipv, cast_type)];
        int tx_bytes = skb->len;
-       enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO;
-       struct qeth_eddp_context *ctx = NULL;
-
-       if ((card->info.type == QETH_CARD_TYPE_IQD) &&
-           (skb->protocol != htons(ETH_P_IPV6)) &&
-           (skb->protocol != htons(ETH_P_IP)))
+       bool large_send;
+       int data_offset = -1;
+       int nr_frags;
+
+       if (((card->info.type == QETH_CARD_TYPE_IQD) &&
+            (((card->options.cq != QETH_CQ_ENABLED) && !ipv) ||
+             ((card->options.cq == QETH_CQ_ENABLED) &&
+              (skb->protocol != ETH_P_AF_IUCV)))) ||
+           card->options.sniffer)
                        goto tx_drop;
 
        if ((card->state != CARD_STATE_UP) || !card->lan_online) {
@@ -2654,24 +2934,36 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                card->perf_stats.outbound_start_time = qeth_get_micros();
        }
 
-       /* create a clone with writeable headroom */
-       new_skb = skb_realloc_headroom(skb, sizeof(struct qeth_hdr_tso) +
-                                       VLAN_HLEN);
-       if (!new_skb)
-               goto tx_drop;
+       large_send = skb_is_gso(skb);
+
+       if ((card->info.type == QETH_CARD_TYPE_IQD) && (!large_send) &&
+           (skb_shinfo(skb)->nr_frags == 0)) {
+               new_skb = skb;
+               if (new_skb->protocol == ETH_P_AF_IUCV)
+                       data_offset = 0;
+               else
+                       data_offset = ETH_HLEN;
+               hdr = kmem_cache_alloc(qeth_core_header_cache, GFP_ATOMIC);
+               if (!hdr)
+                       goto tx_drop;
+               elements_needed++;
+       } else {
+               /* create a clone with writeable headroom */
+               new_skb = skb_realloc_headroom(skb, sizeof(struct qeth_hdr_tso)
+                                       + VLAN_HLEN);
+               if (!new_skb)
+                       goto tx_drop;
+       }
 
        if (card->info.type == QETH_CARD_TYPE_IQD) {
-               skb_pull(new_skb, ETH_HLEN);
+               if (data_offset < 0)
+                       skb_pull(new_skb, ETH_HLEN);
        } else {
-               if (new_skb->protocol == htons(ETH_P_IP)) {
-                       if (card->dev->type == ARPHRD_IEEE802_TR)
-                               skb_pull(new_skb, TR_HLEN);
-                       else
-                               skb_pull(new_skb, ETH_HLEN);
+               if (ipv == 4) {
+                       skb_pull(new_skb, ETH_HLEN);
                }
 
-               if (new_skb->protocol == ETH_P_IPV6 && card->vlangrp &&
-                               vlan_tx_tag_present(new_skb)) {
+               if (ipv != 4 && vlan_tx_tag_present(new_skb)) {
                        skb_push(new_skb, VLAN_HLEN);
                        skb_copy_to_linear_data(new_skb, new_skb->data + 4, 4);
                        skb_copy_to_linear_data_offset(new_skb, 4,
@@ -2681,25 +2973,24 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        tag = (u16 *)(new_skb->data + 12);
                        *tag = __constant_htons(ETH_P_8021Q);
                        *(tag + 1) = htons(vlan_tx_tag_get(new_skb));
-                       VLAN_TX_SKB_CB(new_skb)->magic = 0;
                }
        }
 
        netif_stop_queue(dev);
 
-       if (skb_is_gso(new_skb))
-               large_send = card->options.large_send;
-
        /* fix hardware limitation: as long as we do not have sbal
-        * chaining we can not send long frag lists so we temporary
-        * switch to EDDP
+        * chaining we can not send long frag lists
         */
-       if ((large_send == QETH_LARGE_SEND_TSO) &&
-               ((skb_shinfo(new_skb)->nr_frags + 2) > 16))
-               large_send = QETH_LARGE_SEND_EDDP;
+       if (large_send) {
+               if (qeth_l3_tso_elements(new_skb) + 1 > 16) {
+                       if (skb_linearize(new_skb))
+                               goto tx_drop;
+                       if (card->options.performance_stats)
+                               card->perf_stats.tx_lin++;
+               }
+       }
 
-       if ((large_send == QETH_LARGE_SEND_TSO) &&
-           (cast_type == RTN_UNSPEC)) {
+       if (large_send && (cast_type == RTN_UNSPEC)) {
                hdr = (struct qeth_hdr *)skb_push(new_skb,
                                                sizeof(struct qeth_hdr_tso));
                memset(hdr, 0, sizeof(struct qeth_hdr_tso));
@@ -2707,39 +2998,51 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                qeth_tso_fill_header(card, hdr, new_skb);
                elements_needed++;
        } else {
-               hdr = (struct qeth_hdr *)skb_push(new_skb,
+               if (data_offset < 0) {
+                       hdr = (struct qeth_hdr *)skb_push(new_skb,
                                                sizeof(struct qeth_hdr));
-               qeth_l3_fill_header(card, hdr, new_skb, ipv, cast_type);
+                       qeth_l3_fill_header(card, hdr, new_skb, ipv,
+                                               cast_type);
+               } else {
+                       if (new_skb->protocol == ETH_P_AF_IUCV)
+                               qeth_l3_fill_af_iucv_hdr(card, hdr, new_skb);
+                       else {
+                               qeth_l3_fill_header(card, hdr, new_skb, ipv,
+                                                       cast_type);
+                               hdr->hdr.l3.length = new_skb->len - data_offset;
+                       }
+               }
+
+               if (skb->ip_summed == CHECKSUM_PARTIAL)
+                       qeth_l3_hdr_csum(card, hdr, new_skb);
        }
 
-       if (large_send == QETH_LARGE_SEND_EDDP) {
-               /* new_skb is not owned by a socket so we use skb to get
-                * the protocol
-                */
-               ctx = qeth_eddp_create_context(card, new_skb, hdr,
-                                               skb->sk->sk_protocol);
-               if (ctx == NULL) {
-                       PRINT_WARN("could not create eddp context\n");
-                       goto tx_drop;
-               }
-       } else {
-               int elems = qeth_get_elements_no(card, (void *)hdr, new_skb,
+       elems = qeth_get_elements_no(card, (void *)hdr, new_skb,
                                                 elements_needed);
-               if (!elems)
-                       goto tx_drop;
-               elements_needed += elems;
+       if (!elems) {
+               if (data_offset >= 0)
+                       kmem_cache_free(qeth_core_header_cache, hdr);
+               goto tx_drop;
        }
+       elements_needed += elems;
+       nr_frags = skb_shinfo(new_skb)->nr_frags;
 
-       if ((large_send == QETH_LARGE_SEND_NO) &&
-           (new_skb->ip_summed == CHECKSUM_PARTIAL))
-               qeth_tx_csum(new_skb);
+       if (card->info.type != QETH_CARD_TYPE_IQD) {
+               int len;
+               if (large_send)
+                       len = ((unsigned long)tcp_hdr(new_skb) +
+                               tcp_hdr(new_skb)->doff * 4) -
+                               (unsigned long)new_skb->data;
+               else
+                       len = sizeof(struct qeth_hdr_layer3);
 
-       if (card->info.type != QETH_CARD_TYPE_IQD)
+               if (qeth_hdr_chk_and_bounce(new_skb, len))
+                       goto tx_drop;
                rc = qeth_do_send_packet(card, queue, new_skb, hdr,
-                                        elements_needed, ctx);
-       else
+                                        elements_needed);
+       else
                rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr,
-                                             elements_needed, ctx);
+                                       elements_needed, data_offset, 0);
 
        if (!rc) {
                card->stats.tx_packets++;
@@ -2747,25 +3050,20 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                if (new_skb != skb)
                        dev_kfree_skb_any(skb);
                if (card->options.performance_stats) {
-                       if (large_send != QETH_LARGE_SEND_NO) {
+                       if (large_send) {
                                card->perf_stats.large_send_bytes += tx_bytes;
                                card->perf_stats.large_send_cnt++;
                        }
-                       if (skb_shinfo(new_skb)->nr_frags > 0) {
+                       if (nr_frags) {
                                card->perf_stats.sg_skbs_sent++;
                                /* nr_frags + skb->data */
-                               card->perf_stats.sg_frags_sent +=
-                                       skb_shinfo(new_skb)->nr_frags + 1;
+                               card->perf_stats.sg_frags_sent += nr_frags + 1;
                        }
                }
-
-               if (ctx != NULL) {
-                       qeth_eddp_put_context(ctx);
-                       dev_kfree_skb_any(new_skb);
-               }
+               rc = NETDEV_TX_OK;
        } else {
-               if (ctx != NULL)
-                       qeth_eddp_put_context(ctx);
+               if (data_offset >= 0)
+                       kmem_cache_free(qeth_core_header_cache, hdr);
 
                if (rc == -EBUSY) {
                        if (new_skb != skb)
@@ -2787,103 +3085,98 @@ tx_drop:
        if ((new_skb != skb) && new_skb)
                dev_kfree_skb_any(new_skb);
        dev_kfree_skb_any(skb);
+       netif_wake_queue(dev);
        return NETDEV_TX_OK;
 }
 
-static int qeth_l3_open(struct net_device *dev)
+static int __qeth_l3_open(struct net_device *dev)
 {
-       struct qeth_card *card = netdev_priv(dev);
+       struct qeth_card *card = dev->ml_priv;
+       int rc = 0;
 
-       QETH_DBF_TEXT(TRACE, 4, "qethopen");
+       QETH_CARD_TEXT(card, 4, "qethopen");
+       if (card->state == CARD_STATE_UP)
+               return rc;
        if (card->state != CARD_STATE_SOFTSETUP)
                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))
-               netif_carrier_off(dev);
-       return 0;
+       if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) {
+               napi_enable(&card->napi);
+               napi_schedule(&card->napi);
+       } else
+               rc = -EIO;
+       return rc;
+}
+
+static int qeth_l3_open(struct net_device *dev)
+{
+       struct qeth_card *card = dev->ml_priv;
+
+       QETH_CARD_TEXT(card, 5, "qethope_");
+       if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
+               QETH_CARD_TEXT(card, 3, "openREC");
+               return -ERESTARTSYS;
+       }
+       return __qeth_l3_open(dev);
 }
 
 static int qeth_l3_stop(struct net_device *dev)
 {
-       struct qeth_card *card = netdev_priv(dev);
+       struct qeth_card *card = dev->ml_priv;
 
-       QETH_DBF_TEXT(TRACE, 4, "qethstop");
+       QETH_CARD_TEXT(card, 4, "qethstop");
        netif_tx_disable(dev);
-       card->dev->flags &= ~IFF_UP;
-       if (card->state == CARD_STATE_UP)
+       if (card->state == CARD_STATE_UP) {
                card->state = CARD_STATE_SOFTSETUP;
+               napi_disable(&card->napi);
+       }
        return 0;
 }
 
-static u32 qeth_l3_ethtool_get_rx_csum(struct net_device *dev)
+static netdev_features_t qeth_l3_fix_features(struct net_device *dev,
+       netdev_features_t features)
 {
-       struct qeth_card *card = netdev_priv(dev);
+       struct qeth_card *card = dev->ml_priv;
 
-       return (card->options.checksum_type == HW_CHECKSUMMING);
+       if (!qeth_is_supported(card, IPA_OUTBOUND_CHECKSUM))
+               features &= ~NETIF_F_IP_CSUM;
+       if (!qeth_is_supported(card, IPA_OUTBOUND_TSO))
+               features &= ~NETIF_F_TSO;
+       if (!qeth_is_supported(card, IPA_INBOUND_CHECKSUM))
+               features &= ~NETIF_F_RXCSUM;
+
+       return features;
 }
 
-static int qeth_l3_ethtool_set_rx_csum(struct net_device *dev, u32 data)
+static int qeth_l3_set_features(struct net_device *dev,
+       netdev_features_t features)
 {
-       struct qeth_card *card = netdev_priv(dev);
-       enum qeth_card_states old_state;
-       enum qeth_checksum_types csum_type;
-
-       if ((card->state != CARD_STATE_UP) &&
-           (card->state != CARD_STATE_DOWN))
-               return -EPERM;
+       struct qeth_card *card = dev->ml_priv;
+       u32 changed = dev->features ^ features;
+       int err;
 
-       if (data)
-               csum_type = HW_CHECKSUMMING;
-       else
-               csum_type = SW_CHECKSUMMING;
+       if (!(changed & NETIF_F_RXCSUM))
+               return 0;
 
-       if (card->options.checksum_type != csum_type) {
-               old_state = card->state;
-               if (card->state == CARD_STATE_UP)
-                       __qeth_l3_set_offline(card->gdev, 1);
-               card->options.checksum_type = csum_type;
-               if (old_state == CARD_STATE_UP)
-                       __qeth_l3_set_online(card->gdev, 1);
-       }
-       return 0;
-}
+       if (card->state == CARD_STATE_DOWN ||
+           card->state == CARD_STATE_RECOVER)
+               return 0;
 
-static int qeth_l3_ethtool_set_tso(struct net_device *dev, u32 data)
-{
-       struct qeth_card *card = netdev_priv(dev);
+       err = qeth_l3_set_rx_csum(card, features & NETIF_F_RXCSUM);
+       if (err)
+               dev->features = features ^ NETIF_F_RXCSUM;
 
-       if (data) {
-               if (card->options.large_send == QETH_LARGE_SEND_NO) {
-                       if (card->info.type == QETH_CARD_TYPE_IQD)
-                               card->options.large_send = QETH_LARGE_SEND_EDDP;
-                       else
-                               card->options.large_send = QETH_LARGE_SEND_TSO;
-                       dev->features |= NETIF_F_TSO;
-               }
-       } else {
-               dev->features &= ~NETIF_F_TSO;
-               card->options.large_send = QETH_LARGE_SEND_NO;
-       }
-       return 0;
+       return err;
 }
 
-static struct ethtool_ops qeth_l3_ethtool_ops = {
+static const struct ethtool_ops qeth_l3_ethtool_ops = {
        .get_link = ethtool_op_get_link,
-       .get_tx_csum = ethtool_op_get_tx_csum,
-       .set_tx_csum = ethtool_op_set_tx_hw_csum,
-       .get_rx_csum = qeth_l3_ethtool_get_rx_csum,
-       .set_rx_csum = qeth_l3_ethtool_set_rx_csum,
-       .get_sg      = ethtool_op_get_sg,
-       .set_sg      = ethtool_op_set_sg,
-       .get_tso     = ethtool_op_get_tso,
-       .set_tso     = qeth_l3_ethtool_set_tso,
        .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,
 };
@@ -2912,116 +3205,99 @@ qeth_l3_neigh_setup(struct net_device *dev, struct neigh_parms *np)
        return 0;
 }
 
+static const struct net_device_ops qeth_l3_netdev_ops = {
+       .ndo_open               = qeth_l3_open,
+       .ndo_stop               = qeth_l3_stop,
+       .ndo_get_stats          = qeth_get_stats,
+       .ndo_start_xmit         = qeth_l3_hard_start_xmit,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_rx_mode        = qeth_l3_set_multicast_list,
+       .ndo_do_ioctl           = qeth_l3_do_ioctl,
+       .ndo_change_mtu         = qeth_change_mtu,
+       .ndo_fix_features       = qeth_l3_fix_features,
+       .ndo_set_features       = qeth_l3_set_features,
+       .ndo_vlan_rx_add_vid    = qeth_l3_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = qeth_l3_vlan_rx_kill_vid,
+       .ndo_tx_timeout         = qeth_tx_timeout,
+};
+
+static const struct net_device_ops qeth_l3_osa_netdev_ops = {
+       .ndo_open               = qeth_l3_open,
+       .ndo_stop               = qeth_l3_stop,
+       .ndo_get_stats          = qeth_get_stats,
+       .ndo_start_xmit         = qeth_l3_hard_start_xmit,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_rx_mode        = qeth_l3_set_multicast_list,
+       .ndo_do_ioctl           = qeth_l3_do_ioctl,
+       .ndo_change_mtu         = qeth_change_mtu,
+       .ndo_fix_features       = qeth_l3_fix_features,
+       .ndo_set_features       = qeth_l3_set_features,
+       .ndo_vlan_rx_add_vid    = qeth_l3_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = qeth_l3_vlan_rx_kill_vid,
+       .ndo_tx_timeout         = qeth_tx_timeout,
+       .ndo_neigh_setup        = qeth_l3_neigh_setup,
+};
+
 static int qeth_l3_setup_netdev(struct qeth_card *card)
 {
-       if (card->info.type == QETH_CARD_TYPE_OSAE) {
+       if (card->info.type == QETH_CARD_TYPE_OSD ||
+           card->info.type == QETH_CARD_TYPE_OSX) {
                if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
                    (card->info.link_type == QETH_LINK_TYPE_HSTR)) {
-#ifdef CONFIG_TR
-                       card->dev = alloc_trdev(0);
-#endif
-                       if (!card->dev)
-                               return -ENODEV;
+                       pr_info("qeth_l3: ignoring TR device\n");
+                       return -ENODEV;
                } else {
                        card->dev = alloc_etherdev(0);
                        if (!card->dev)
                                return -ENODEV;
-                       card->dev->neigh_setup = qeth_l3_neigh_setup;
+                       card->dev->netdev_ops = &qeth_l3_osa_netdev_ops;
 
                        /*IPv6 address autoconfiguration stuff*/
                        qeth_l3_get_unique_id(card);
                        if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
                                card->dev->dev_id = card->info.unique_id &
                                                         0xffff;
+                       if (!card->info.guestlan) {
+                               card->dev->hw_features = NETIF_F_SG |
+                                       NETIF_F_RXCSUM | NETIF_F_IP_CSUM |
+                                       NETIF_F_TSO;
+                               card->dev->features = NETIF_F_RXCSUM;
+                       }
                }
        } else if (card->info.type == QETH_CARD_TYPE_IQD) {
                card->dev = alloc_netdev(0, "hsi%d", ether_setup);
                if (!card->dev)
                        return -ENODEV;
                card->dev->flags |= IFF_NOARP;
+               card->dev->netdev_ops = &qeth_l3_netdev_ops;
                qeth_l3_iqd_read_initial_mac(card);
+               if (card->options.hsuid[0])
+                       memcpy(card->dev->perm_addr, card->options.hsuid, 9);
        } else
                return -ENODEV;
 
-       card->dev->hard_start_xmit = qeth_l3_hard_start_xmit;
-       card->dev->priv = card;
-       card->dev->tx_timeout = &qeth_tx_timeout;
+       card->dev->ml_priv = card;
        card->dev->watchdog_timeo = QETH_TX_TIMEOUT;
-       card->dev->open = qeth_l3_open;
-       card->dev->stop = qeth_l3_stop;
-       card->dev->do_ioctl = qeth_l3_do_ioctl;
-       card->dev->get_stats = qeth_get_stats;
-       card->dev->change_mtu = qeth_change_mtu;
-       card->dev->set_multicast_list = qeth_l3_set_multicast_list;
-       card->dev->vlan_rx_register = qeth_l3_vlan_rx_register;
-       card->dev->vlan_rx_add_vid = qeth_l3_vlan_rx_add_vid;
-       card->dev->vlan_rx_kill_vid = qeth_l3_vlan_rx_kill_vid;
        card->dev->mtu = card->info.initial_mtu;
-       card->dev->set_mac_address = NULL;
        SET_ETHTOOL_OPS(card->dev, &qeth_l3_ethtool_ops);
        card->dev->features |=  NETIF_F_HW_VLAN_TX |
                                NETIF_F_HW_VLAN_RX |
                                NETIF_F_HW_VLAN_FILTER;
+       card->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
+       card->dev->gso_max_size = 15 * PAGE_SIZE;
 
        SET_NETDEV_DEV(card->dev, &card->gdev->dev);
+       netif_napi_add(card->dev, &card->napi, qeth_l3_poll, QETH_NAPI_WEIGHT);
        return register_netdev(card->dev);
 }
 
-static void qeth_l3_qdio_input_handler(struct ccw_device *ccwdev,
-               unsigned int status, unsigned int qdio_err,
-               unsigned int siga_err, unsigned int queue, int first_element,
-               int count, unsigned long card_ptr)
-{
-       struct net_device *net_dev;
-       struct qeth_card *card;
-       struct qeth_qdio_buffer *buffer;
-       int index;
-       int i;
-
-       card = (struct qeth_card *) card_ptr;
-       net_dev = card->dev;
-       if (card->options.performance_stats) {
-               card->perf_stats.inbound_cnt++;
-               card->perf_stats.inbound_start_time = qeth_get_micros();
-       }
-       if (status & QDIO_STATUS_LOOK_FOR_ERROR) {
-               if (status & QDIO_STATUS_ACTIVATE_CHECK_CONDITION) {
-                       QETH_DBF_TEXT(TRACE, 1, "qdinchk");
-                       QETH_DBF_TEXT_(TRACE, 1, "%s", CARD_BUS_ID(card));
-                       QETH_DBF_TEXT_(TRACE, 1, "%04X%04X",
-                                       first_element, count);
-                       QETH_DBF_TEXT_(TRACE, 1, "%04X%04X", queue, status);
-                       qeth_schedule_recovery(card);
-                       return;
-               }
-       }
-       for (i = first_element; i < (first_element + count); ++i) {
-               index = i % QDIO_MAX_BUFFERS_PER_Q;
-               buffer = &card->qdio.in_q->bufs[index];
-               if (!((status & QDIO_STATUS_LOOK_FOR_ERROR) &&
-                     qeth_check_qdio_errors(buffer->buffer,
-                                            qdio_err, siga_err, "qinerr")))
-                       qeth_l3_process_inbound_buffer(card, buffer, index);
-               /* clear buffer and give back to hardware */
-               qeth_put_buffer_pool_entry(card, buffer->pool_entry);
-               qeth_queue_input_buffer(card, index);
-       }
-       if (card->options.performance_stats)
-               card->perf_stats.inbound_time += qeth_get_micros() -
-                       card->perf_stats.inbound_start_time;
-}
-
 static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
 {
        struct qeth_card *card = dev_get_drvdata(&gdev->dev);
 
        qeth_l3_create_device_attributes(&gdev->dev);
        card->options.layer2 = 0;
-       card->discipline.input_handler = (qdio_handler_t *)
-               qeth_l3_qdio_input_handler;
-       card->discipline.output_handler = (qdio_handler_t *)
-               qeth_qdio_output_handler;
-       card->discipline.recover = qeth_l3_recover;
+       card->info.hwtrap = 0;
        return 0;
 }
 
@@ -3029,20 +3305,20 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
 {
        struct qeth_card *card = dev_get_drvdata(&cgdev->dev);
 
+       qeth_l3_remove_device_attributes(&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) {
-               card->use_hard_stop = 1;
+       if (cgdev->state == CCWGROUP_ONLINE)
                qeth_l3_set_offline(cgdev);
-       }
 
        if (card->dev) {
                unregister_netdev(card->dev);
                card->dev = NULL;
        }
 
-       qeth_l3_remove_device_attributes(&cgdev->dev);
-       qeth_l3_clear_ip_list(card, 0, 0);
+       qeth_l3_clear_ip_list(card, 0);
        qeth_l3_clear_ipato_list(card);
        return;
 }
@@ -3054,45 +3330,33 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        enum qeth_card_states recover_flag;
 
        BUG_ON(!card);
+       mutex_lock(&card->discipline_mutex);
+       mutex_lock(&card->conf_mutex);
        QETH_DBF_TEXT(SETUP, 2, "setonlin");
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
-       qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-       if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-               PRINT_WARN("set_online of card %s interrupted by user!\n",
-                          CARD_BUS_ID(card));
-               return -ERESTARTSYS;
-       }
-
        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;
        }
 
-       qeth_l3_query_ipassists(card, QETH_PROT_IPV4);
-
-       if (!card->dev && qeth_l3_setup_netdev(card))
+       if (!card->dev && qeth_l3_setup_netdev(card)) {
+               rc = -ENODEV;
                goto out_remove;
+       }
+
+       if (qeth_is_diagass_supported(card, QETH_DIAGS_CMD_TRAP)) {
+               if (card->info.hwtrap &&
+                   qeth_hw_trap(card, QETH_DIAGS_TRAP_ARM))
+                       card->info.hwtrap = 0;
+       } else
+               card->info.hwtrap = 0;
 
        card->state = CARD_STATE_HARDSETUP;
+       memset(&card->rx, 0, sizeof(struct qeth_rx));
        qeth_print_status_message(card);
 
        /* softsetup */
@@ -3102,48 +3366,62 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        if (rc) {
                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
                if (rc == 0xe080) {
-                       PRINT_WARN("LAN on card %s if offline! "
-                                  "Waiting for STARTLAN from card.\n",
-                                  CARD_BUS_ID(card));
+                       dev_warn(&card->gdev->dev,
+                               "The LAN is offline\n");
                        card->lan_online = 0;
+                       goto contin;
                }
-               return rc;
+               rc = -ENODEV;
+               goto out_remove;
        } else
                card->lan_online = 1;
-       qeth_set_large_send(card, card->options.large_send);
 
+contin:
        rc = qeth_l3_setadapter_parms(card);
        if (rc)
                QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);
-       rc = qeth_l3_start_ipassists(card);
-       if (rc)
-               QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);
-       rc = qeth_l3_setrouting_v4(card);
-       if (rc)
-               QETH_DBF_TEXT_(SETUP, 2, "4err%d", rc);
-       rc = qeth_l3_setrouting_v6(card);
-       if (rc)
-               QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);
+       if (!card->options.sniffer) {
+               rc = qeth_l3_start_ipassists(card);
+               if (rc)
+                       QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);
+               rc = qeth_l3_setrouting_v4(card);
+               if (rc)
+                       QETH_DBF_TEXT_(SETUP, 2, "4err%d", rc);
+               rc = qeth_l3_setrouting_v6(card);
+               if (rc)
+                       QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);
+       }
        netif_tx_disable(card->dev);
 
        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;
-       netif_carrier_on(card->dev);
 
        qeth_set_allowed_threads(card, 0xffffffff, 0);
-       if ((recover_flag == CARD_STATE_RECOVER) && recovery_mode) {
-                       qeth_l3_open(card->dev);
-                       qeth_l3_set_multicast_list(card->dev);
+       qeth_l3_set_ip_addr_list(card);
+       if (card->lan_online)
+               netif_carrier_on(card->dev);
+       else
+               netif_carrier_off(card->dev);
+       if (recover_flag == CARD_STATE_RECOVER) {
+               rtnl_lock();
+               if (recovery_mode)
+                       __qeth_l3_open(card->dev);
+               else
+                       dev_open(card->dev);
+               qeth_l3_set_multicast_list(card->dev);
+               rtnl_unlock();
        }
        /* let user_space know that device is online */
        kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
+       mutex_unlock(&card->conf_mutex);
+       mutex_unlock(&card->discipline_mutex);
        return 0;
 out_remove:
-       card->use_hard_stop = 1;
        qeth_l3_stop_card(card, 0);
        ccw_device_set_offline(CARD_DDEV(card));
        ccw_device_set_offline(CARD_WDEV(card));
@@ -3152,7 +3430,9 @@ out_remove:
                card->state = CARD_STATE_RECOVER;
        else
                card->state = CARD_STATE_DOWN;
-       return -ENODEV;
+       mutex_unlock(&card->conf_mutex);
+       mutex_unlock(&card->discipline_mutex);
+       return rc;
 }
 
 static int qeth_l3_set_online(struct ccwgroup_device *gdev)
@@ -3167,16 +3447,23 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
        int rc = 0, rc2 = 0, rc3 = 0;
        enum qeth_card_states recover_flag;
 
+       mutex_lock(&card->discipline_mutex);
+       mutex_lock(&card->conf_mutex);
        QETH_DBF_TEXT(SETUP, 3, "setoffl");
        QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));
 
        if (card->dev && netif_carrier_ok(card->dev))
                netif_carrier_off(card->dev);
        recover_flag = card->state;
-       if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {
-               PRINT_WARN("Stopping card %s interrupted by user!\n",
-                          CARD_BUS_ID(card));
-               return -ERESTARTSYS;
+       if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap == 2) {
+               qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
+               card->info.hwtrap = 1;
+       }
+       qeth_l3_stop_card(card, recovery_mode);
+       if ((card->options.cq == QETH_CQ_ENABLED) && card->dev) {
+               rtnl_lock();
+               call_netdevice_notifiers(NETDEV_REBOOT, card->dev);
+               rtnl_unlock();
        }
        rc  = ccw_device_set_offline(CARD_DDEV(card));
        rc2 = ccw_device_set_offline(CARD_WDEV(card));
@@ -3189,6 +3476,8 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
                card->state = CARD_STATE_RECOVER;
        /* let user_space know that device is offline */
        kobject_uevent(&cgdev->dev.kobj, KOBJ_CHANGE);
+       mutex_unlock(&card->conf_mutex);
+       mutex_unlock(&card->discipline_mutex);
        return 0;
 }
 
@@ -3203,44 +3492,101 @@ static int qeth_l3_recover(void *ptr)
        int rc = 0;
 
        card = (struct qeth_card *) ptr;
-       QETH_DBF_TEXT(TRACE, 2, "recover1");
-       QETH_DBF_HEX(TRACE, 2, &card, sizeof(void *));
+       QETH_CARD_TEXT(card, 2, "recover1");
+       QETH_CARD_HEX(card, 2, &card, sizeof(void *));
        if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD))
                return 0;
-       QETH_DBF_TEXT(TRACE, 2, "recover2");
-       PRINT_WARN("Recovery of device %s started ...\n",
-                  CARD_BUS_ID(card));
-       card->use_hard_stop = 1;
+       QETH_CARD_TEXT(card, 2, "recover2");
+       dev_warn(&card->gdev->dev,
+               "A recovery process has been started for the device\n");
        __qeth_l3_set_offline(card->gdev, 1);
        rc = __qeth_l3_set_online(card->gdev, 1);
-       /* don't run another scheduled recovery */
+       if (!rc)
+               dev_info(&card->gdev->dev,
+                       "Device successfully recovered!\n");
+       else {
+               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");
+       }
        qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
        qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);
-       if (!rc)
-               PRINT_INFO("Device %s successfully recovered!\n",
-                          CARD_BUS_ID(card));
-       else
-               PRINT_INFO("Device %s could not be recovered!\n",
-                          CARD_BUS_ID(card));
        return 0;
 }
 
 static void qeth_l3_shutdown(struct ccwgroup_device *gdev)
 {
        struct qeth_card *card = dev_get_drvdata(&gdev->dev);
-       qeth_l3_clear_ip_list(card, 0, 0);
+       qeth_set_allowed_threads(card, 0, 1);
+       if ((gdev->state == CCWGROUP_ONLINE) && card->info.hwtrap)
+               qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
        qeth_qdio_clear_card(card, 0);
        qeth_clear_qdio_buffers(card);
 }
 
-struct ccwgroup_driver qeth_l3_ccwgroup_driver = {
-       .probe = qeth_l3_probe_device,
+static int qeth_l3_pm_suspend(struct ccwgroup_device *gdev)
+{
+       struct qeth_card *card = dev_get_drvdata(&gdev->dev);
+
+       if (card->dev)
+               netif_device_detach(card->dev);
+       qeth_set_allowed_threads(card, 0, 1);
+       wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
+       if (gdev->state == CCWGROUP_OFFLINE)
+               return 0;
+       if (card->state == CARD_STATE_UP) {
+               if (card->info.hwtrap)
+                       qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
+               __qeth_l3_set_offline(card->gdev, 1);
+       } else
+               __qeth_l3_set_offline(card->gdev, 0);
+       return 0;
+}
+
+static int qeth_l3_pm_resume(struct ccwgroup_device *gdev)
+{
+       struct qeth_card *card = dev_get_drvdata(&gdev->dev);
+       int rc = 0;
+
+       if (gdev->state == CCWGROUP_OFFLINE)
+               goto out;
+
+       if (card->state == CARD_STATE_RECOVER) {
+               rc = __qeth_l3_set_online(card->gdev, 1);
+               if (rc) {
+                       rtnl_lock();
+                       dev_close(card->dev);
+                       rtnl_unlock();
+               }
+       } else
+               rc = __qeth_l3_set_online(card->gdev, 0);
+out:
+       qeth_set_allowed_threads(card, 0xffffffff, 0);
+       if (card->dev)
+               netif_device_attach(card->dev);
+       if (rc)
+               dev_warn(&card->gdev->dev, "The qeth device driver "
+                       "failed to recover an error on the device\n");
+       return rc;
+}
+
+struct qeth_discipline qeth_l3_discipline = {
+       .start_poll = qeth_qdio_start_poll,
+       .input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
+       .output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
+       .recover = qeth_l3_recover,
+       .setup = qeth_l3_probe_device,
        .remove = qeth_l3_remove_device,
        .set_online = qeth_l3_set_online,
        .set_offline = qeth_l3_set_offline,
        .shutdown = qeth_l3_shutdown,
+       .freeze = qeth_l3_pm_suspend,
+       .thaw = qeth_l3_pm_resume,
+       .restore = qeth_l3_pm_resume,
 };
-EXPORT_SYMBOL_GPL(qeth_l3_ccwgroup_driver);
+EXPORT_SYMBOL_GPL(qeth_l3_discipline);
 
 static int qeth_l3_ip_event(struct notifier_block *this,
                            unsigned long event, void *ptr)
@@ -3253,10 +3599,10 @@ static int qeth_l3_ip_event(struct notifier_block *this,
        if (dev_net(dev) != &init_net)
                return NOTIFY_DONE;
 
-       QETH_DBF_TEXT(TRACE, 3, "ipevent");
        card = qeth_l3_get_card_from_dev(dev);
        if (!card)
                return NOTIFY_DONE;
+       QETH_CARD_TEXT(card, 3, "ipevent");
 
        addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
        if (addr != NULL) {
@@ -3300,11 +3646,10 @@ static int qeth_l3_ip6_event(struct notifier_block *this,
        struct qeth_ipaddr *addr;
        struct qeth_card *card;
 
-       QETH_DBF_TEXT(TRACE, 3, "ip6event");
-
        card = qeth_l3_get_card_from_dev(dev);
        if (!card)
                return NOTIFY_DONE;
+       QETH_CARD_TEXT(card, 3, "ip6event");
        if (!qeth_is_supported(card, IPA_IPV6))
                return NOTIFY_DONE;
 
@@ -3343,7 +3688,7 @@ static int qeth_l3_register_notifiers(void)
 {
        int rc;
 
-       QETH_DBF_TEXT(TRACE, 5, "regnotif");
+       QETH_DBF_TEXT(SETUP, 5, "regnotif");
        rc = register_inetaddr_notifier(&qeth_l3_ip_notifier);
        if (rc)
                return rc;
@@ -3354,7 +3699,7 @@ static int qeth_l3_register_notifiers(void)
                return rc;
        }
 #else
-       PRINT_WARN("layer 3 discipline no IPv6 support\n");
+       pr_warning("There is no IPv6 support for the layer 3 discipline\n");
 #endif
        return 0;
 }
@@ -3362,7 +3707,7 @@ static int qeth_l3_register_notifiers(void)
 static void qeth_l3_unregister_notifiers(void)
 {
 
-       QETH_DBF_TEXT(TRACE, 5, "unregnot");
+       QETH_DBF_TEXT(SETUP, 5, "unregnot");
        BUG_ON(unregister_inetaddr_notifier(&qeth_l3_ip_notifier));
 #ifdef CONFIG_QETH_IPV6
        BUG_ON(unregister_inet6addr_notifier(&qeth_l3_ip6_notifier));
@@ -3373,7 +3718,7 @@ static int __init qeth_l3_init(void)
 {
        int rc = 0;
 
-       PRINT_INFO("register layer 3 discipline\n");
+       pr_info("register layer 3 discipline\n");
        rc = qeth_l3_register_notifiers();
        return rc;
 }
@@ -3381,7 +3726,7 @@ static int __init qeth_l3_init(void)
 static void __exit qeth_l3_exit(void)
 {
        qeth_l3_unregister_notifiers();
-       PRINT_INFO("unregister layer 3 discipline\n");
+       pr_info("unregister layer 3 discipline\n");
 }
 
 module_init(qeth_l3_init);