qeth: new qeth device driver

List of major changes and improvements:
 no manipulation of the global ARP constructor
 clean code split into core, layer 2 and layer 3 functionality
 better exploitation of the ethtool interface
 better representation of the various hardware capabilities
 fix packet socket support (tcpdump), no fake_ll required
 osasnmpd notification via udev events
 coding style and beautification

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 1051 insertions, 0 deletions

diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
new file mode 100644
index 000000000000..08f51fd902c4
--- /dev/null
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -0,0 +1,1051 @@
+/*
+ *  drivers/s390/net/qeth_l3_sys.c
+ *
+ *    Copyright IBM Corp. 2007
+ *    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>
+ */
+
+#include "qeth_l3.h"
+
+#define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \
+struct device_attribute dev_attr_##_id = __ATTR(_name, _mode, _show, _store)
+
+static const char *qeth_l3_get_checksum_str(struct qeth_card *card)
+{
+        if (card->options.checksum_type == SW_CHECKSUMMING)
+                return "sw";
+        else if (card->options.checksum_type == HW_CHECKSUMMING)
+                return "hw";
+        else
+                return "no";
+}
+
+static ssize_t qeth_l3_dev_route_show(struct qeth_card *card,
+                        struct qeth_routing_info *route, char *buf)
+{
+        switch (route->type) {
+        case PRIMARY_ROUTER:
+                return sprintf(buf, "%s\n", "primary router");
+        case SECONDARY_ROUTER:
+                return sprintf(buf, "%s\n", "secondary router");
+        case MULTICAST_ROUTER:
+                if (card->info.broadcast_capable == QETH_BROADCAST_WITHOUT_ECHO)
+                        return sprintf(buf, "%s\n", "multicast router+");
+                else
+                        return sprintf(buf, "%s\n", "multicast router");
+        case PRIMARY_CONNECTOR:
+                if (card->info.broadcast_capable == QETH_BROADCAST_WITHOUT_ECHO)
+                        return sprintf(buf, "%s\n", "primary connector+");
+                else
+                        return sprintf(buf, "%s\n", "primary connector");
+        case SECONDARY_CONNECTOR:
+                if (card->info.broadcast_capable == QETH_BROADCAST_WITHOUT_ECHO)
+                        return sprintf(buf, "%s\n", "secondary connector+");
+                else
+                        return sprintf(buf, "%s\n", "secondary connector");
+        default:
+                return sprintf(buf, "%s\n", "no");
+        }
+}
+
+static ssize_t qeth_l3_dev_route4_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_route_show(card, &card->options.route4, buf);
+}
+
+static ssize_t qeth_l3_dev_route_store(struct qeth_card *card,
+                struct qeth_routing_info *route, enum qeth_prot_versions prot,
+                const char *buf, size_t count)
+{
+        enum qeth_routing_types old_route_type = route->type;
+        char *tmp;
+        int rc;
+
+        tmp = strsep((char **) &buf, "\n");
+
+        if (!strcmp(tmp, "no_router")) {
+                route->type = NO_ROUTER;
+        } else if (!strcmp(tmp, "primary_connector")) {
+                route->type = PRIMARY_CONNECTOR;
+        } else if (!strcmp(tmp, "secondary_connector")) {
+                route->type = SECONDARY_CONNECTOR;
+        } else if (!strcmp(tmp, "primary_router")) {
+                route->type = PRIMARY_ROUTER;
+        } else if (!strcmp(tmp, "secondary_router")) {
+                route->type = SECONDARY_ROUTER;
+        } else if (!strcmp(tmp, "multicast_router")) {
+                route->type = MULTICAST_ROUTER;
+        } else {
+                PRINT_WARN("Invalid routing type '%s'.\n", tmp);
+                return -EINVAL;
+        }
+        if (((card->state == CARD_STATE_SOFTSETUP) ||
+             (card->state == CARD_STATE_UP)) &&
+            (old_route_type != route->type)) {
+                if (prot == QETH_PROT_IPV4)
+                        rc = qeth_l3_setrouting_v4(card);
+                else if (prot == QETH_PROT_IPV6)
+                        rc = qeth_l3_setrouting_v6(card);
+        }
+        return count;
+}
+
+static ssize_t qeth_l3_dev_route4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_route_store(card, &card->options.route4,
+                                QETH_PROT_IPV4, buf, count);
+}
+
+static DEVICE_ATTR(route4, 0644, qeth_l3_dev_route4_show,
+                        qeth_l3_dev_route4_store);
+
+static ssize_t qeth_l3_dev_route6_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        if (!qeth_is_supported(card, IPA_IPV6))
+                return sprintf(buf, "%s\n", "n/a");
+
+        return qeth_l3_dev_route_show(card, &card->options.route6, buf);
+}
+
+static ssize_t qeth_l3_dev_route6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        if (!qeth_is_supported(card, IPA_IPV6)) {
+                PRINT_WARN("IPv6 not supported for interface %s.\n"
+                           "Routing status no changed.\n",
+                           QETH_CARD_IFNAME(card));
+                return -ENOTSUPP;
+        }
+
+        return qeth_l3_dev_route_store(card, &card->options.route6,
+                                QETH_PROT_IPV6, buf, count);
+}
+
+static DEVICE_ATTR(route6, 0644, qeth_l3_dev_route6_show,
+                        qeth_l3_dev_route6_store);
+
+static ssize_t qeth_l3_dev_fake_broadcast_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return sprintf(buf, "%i\n", card->options.fake_broadcast? 1:0);
+}
+
+static ssize_t qeth_l3_dev_fake_broadcast_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+        int i;
+
+        if (!card)
+                return -EINVAL;
+
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER))
+                return -EPERM;
+
+        i = simple_strtoul(buf, &tmp, 16);
+        if ((i == 0) || (i == 1))
+                card->options.fake_broadcast = i;
+        else {
+                PRINT_WARN("fake_broadcast: write 0 or 1 to this file!\n");
+                return -EINVAL;
+        }
+        return count;
+}
+
+static DEVICE_ATTR(fake_broadcast, 0644, qeth_l3_dev_fake_broadcast_show,
+                   qeth_l3_dev_fake_broadcast_store);
+
+static ssize_t qeth_l3_dev_broadcast_mode_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR)))
+                return sprintf(buf, "n/a\n");
+
+        return sprintf(buf, "%s\n", (card->options.broadcast_mode ==
+                                     QETH_TR_BROADCAST_ALLRINGS)?
+                       "all rings":"local");
+}
+
+static ssize_t qeth_l3_dev_broadcast_mode_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER))
+                return -EPERM;
+
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) {
+                PRINT_WARN("Device is not a tokenring device!\n");
+                return -EINVAL;
+        }
+
+        tmp = strsep((char **) &buf, "\n");
+
+        if (!strcmp(tmp, "local")) {
+                card->options.broadcast_mode = QETH_TR_BROADCAST_LOCAL;
+                return count;
+        } else if (!strcmp(tmp, "all_rings")) {
+                card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;
+                return count;
+        } else {
+                PRINT_WARN("broadcast_mode: invalid mode %s!\n",
+                           tmp);
+                return -EINVAL;
+        }
+        return count;
+}
+
+static DEVICE_ATTR(broadcast_mode, 0644, qeth_l3_dev_broadcast_mode_show,
+                   qeth_l3_dev_broadcast_mode_store);
+
+static ssize_t qeth_l3_dev_canonical_macaddr_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR)))
+                return sprintf(buf, "n/a\n");
+
+        return sprintf(buf, "%i\n", (card->options.macaddr_mode ==
+                                     QETH_TR_MACADDR_CANONICAL)? 1:0);
+}
+
+static ssize_t qeth_l3_dev_canonical_macaddr_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+        int i;
+
+        if (!card)
+                return -EINVAL;
+
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER))
+                return -EPERM;
+
+        if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
+              (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) {
+                PRINT_WARN("Device is not a tokenring device!\n");
+                return -EINVAL;
+        }
+
+        i = simple_strtoul(buf, &tmp, 16);
+        if ((i == 0) || (i == 1))
+                card->options.macaddr_mode = i?
+                        QETH_TR_MACADDR_CANONICAL :
+                        QETH_TR_MACADDR_NONCANONICAL;
+        else {
+                PRINT_WARN("canonical_macaddr: write 0 or 1 to this file!\n");
+                return -EINVAL;
+        }
+        return count;
+}
+
+static DEVICE_ATTR(canonical_macaddr, 0644, qeth_l3_dev_canonical_macaddr_show,
+                   qeth_l3_dev_canonical_macaddr_store);
+
+static ssize_t qeth_l3_dev_checksum_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return sprintf(buf, "%s checksumming\n",
+                        qeth_l3_get_checksum_str(card));
+}
+
+static ssize_t qeth_l3_dev_checksum_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER))
+                return -EPERM;
+
+        tmp = strsep((char **) &buf, "\n");
+        if (!strcmp(tmp, "sw_checksumming"))
+                card->options.checksum_type = SW_CHECKSUMMING;
+        else if (!strcmp(tmp, "hw_checksumming"))
+                card->options.checksum_type = HW_CHECKSUMMING;
+        else if (!strcmp(tmp, "no_checksumming"))
+                card->options.checksum_type = NO_CHECKSUMMING;
+        else {
+                PRINT_WARN("Unknown checksumming type '%s'\n", tmp);
+                return -EINVAL;
+        }
+        return count;
+}
+
+static DEVICE_ATTR(checksumming, 0644, qeth_l3_dev_checksum_show,
+                qeth_l3_dev_checksum_store);
+
+static struct attribute *qeth_l3_device_attrs[] = {
+        &dev_attr_route4.attr,
+        &dev_attr_route6.attr,
+        &dev_attr_fake_broadcast.attr,
+        &dev_attr_broadcast_mode.attr,
+        &dev_attr_canonical_macaddr.attr,
+        &dev_attr_checksumming.attr,
+        NULL,
+};
+
+static struct attribute_group qeth_l3_device_attr_group = {
+        .attrs = qeth_l3_device_attrs,
+};
+
+static ssize_t qeth_l3_dev_ipato_enable_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return sprintf(buf, "%i\n", card->ipato.enabled? 1:0);
+}
+
+static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER))
+                return -EPERM;
+
+        tmp = strsep((char **) &buf, "\n");
+        if (!strcmp(tmp, "toggle")) {
+                card->ipato.enabled = (card->ipato.enabled)? 0 : 1;
+        } else if (!strcmp(tmp, "1")) {
+                card->ipato.enabled = 1;
+        } else if (!strcmp(tmp, "0")) {
+                card->ipato.enabled = 0;
+        } else {
+                PRINT_WARN("ipato_enable: write 0, 1 or 'toggle' to "
+                           "this file\n");
+                return -EINVAL;
+        }
+        return count;
+}
+
+static QETH_DEVICE_ATTR(ipato_enable, enable, 0644,
+                        qeth_l3_dev_ipato_enable_show,
+                        qeth_l3_dev_ipato_enable_store);
+
+static ssize_t qeth_l3_dev_ipato_invert4_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return sprintf(buf, "%i\n", card->ipato.invert4? 1:0);
+}
+
+static ssize_t qeth_l3_dev_ipato_invert4_store(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+
+        tmp = strsep((char **) &buf, "\n");
+        if (!strcmp(tmp, "toggle")) {
+                card->ipato.invert4 = (card->ipato.invert4)? 0 : 1;
+        } else if (!strcmp(tmp, "1")) {
+                card->ipato.invert4 = 1;
+        } else if (!strcmp(tmp, "0")) {
+                card->ipato.invert4 = 0;
+        } else {
+                PRINT_WARN("ipato_invert4: write 0, 1 or 'toggle' to "
+                           "this file\n");
+                return -EINVAL;
+        }
+        return count;
+}
+
+static QETH_DEVICE_ATTR(ipato_invert4, invert4, 0644,
+                        qeth_l3_dev_ipato_invert4_show,
+                        qeth_l3_dev_ipato_invert4_store);
+
+static ssize_t qeth_l3_dev_ipato_add_show(char *buf, struct qeth_card *card,
+                        enum qeth_prot_versions proto)
+{
+        struct qeth_ipato_entry *ipatoe;
+        unsigned long flags;
+        char addr_str[40];
+        int entry_len; /* length of 1 entry string, differs between v4 and v6 */
+        int i = 0;
+
+        entry_len = (proto == QETH_PROT_IPV4)? 12 : 40;
+        /* add strlen for "/<mask>\n" */
+        entry_len += (proto == QETH_PROT_IPV4)? 5 : 6;
+        spin_lock_irqsave(&card->ip_lock, flags);
+        list_for_each_entry(ipatoe, &card->ipato.entries, entry) {
+                if (ipatoe->proto != proto)
+                        continue;
+                /* String must not be longer than PAGE_SIZE. So we check if
+                 * string length gets near PAGE_SIZE. Then we can savely display
+                 * the next IPv6 address (worst case, compared to IPv4) */
+                if ((PAGE_SIZE - i) <= entry_len)
+                        break;
+                qeth_l3_ipaddr_to_string(proto, ipatoe->addr, addr_str);
+                i += snprintf(buf + i, PAGE_SIZE - i,
+                              "%s/%i\n", addr_str, ipatoe->mask_bits);
+        }
+        spin_unlock_irqrestore(&card->ip_lock, flags);
+        i += snprintf(buf + i, PAGE_SIZE - i, "\n");
+
+        return i;
+}
+
+static ssize_t qeth_l3_dev_ipato_add4_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_ipato_add_show(buf, card, QETH_PROT_IPV4);
+}
+
+static int qeth_l3_parse_ipatoe(const char *buf, enum qeth_prot_versions proto,
+                  u8 *addr, int *mask_bits)
+{
+        const char *start, *end;
+        char *tmp;
+        char buffer[40] = {0, };
+
+        start = buf;
+        /* get address string */
+        end = strchr(start, '/');
+        if (!end || (end - start >= 40)) {
+                PRINT_WARN("Invalid format for ipato_addx/delx. "
+                           "Use <ip addr>/<mask bits>\n");
+                return -EINVAL;
+        }
+        strncpy(buffer, start, end - start);
+        if (qeth_l3_string_to_ipaddr(buffer, proto, addr)) {
+                PRINT_WARN("Invalid IP address format!\n");
+                return -EINVAL;
+        }
+        start = end + 1;
+        *mask_bits = simple_strtoul(start, &tmp, 10);
+        if (!strlen(start) ||
+            (tmp == start) ||
+            (*mask_bits > ((proto == QETH_PROT_IPV4) ? 32 : 128))) {
+                PRINT_WARN("Invalid mask bits for ipato_addx/delx !\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static ssize_t qeth_l3_dev_ipato_add_store(const char *buf, size_t count,
+                         struct qeth_card *card, enum qeth_prot_versions proto)
+{
+        struct qeth_ipato_entry *ipatoe;
+        u8 addr[16];
+        int mask_bits;
+        int rc;
+
+        rc = qeth_l3_parse_ipatoe(buf, proto, addr, &mask_bits);
+        if (rc)
+                return rc;
+
+        ipatoe = kzalloc(sizeof(struct qeth_ipato_entry), GFP_KERNEL);
+        if (!ipatoe) {
+                PRINT_WARN("No memory to allocate ipato entry\n");
+                return -ENOMEM;
+        }
+        ipatoe->proto = proto;
+        memcpy(ipatoe->addr, addr, (proto == QETH_PROT_IPV4)? 4:16);
+        ipatoe->mask_bits = mask_bits;
+
+        rc = qeth_l3_add_ipato_entry(card, ipatoe);
+        if (rc) {
+                kfree(ipatoe);
+                return rc;
+        }
+
+        return count;
+}
+
+static ssize_t qeth_l3_dev_ipato_add4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_ipato_add_store(buf, count, card, QETH_PROT_IPV4);
+}
+
+static QETH_DEVICE_ATTR(ipato_add4, add4, 0644,
+                        qeth_l3_dev_ipato_add4_show,
+                        qeth_l3_dev_ipato_add4_store);
+
+static ssize_t qeth_l3_dev_ipato_del_store(const char *buf, size_t count,
+                         struct qeth_card *card, enum qeth_prot_versions proto)
+{
+        u8 addr[16];
+        int mask_bits;
+        int rc;
+
+        rc = qeth_l3_parse_ipatoe(buf, proto, addr, &mask_bits);
+        if (rc)
+                return rc;
+
+        qeth_l3_del_ipato_entry(card, proto, addr, mask_bits);
+
+        return count;
+}
+
+static ssize_t qeth_l3_dev_ipato_del4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_ipato_del_store(buf, count, card, QETH_PROT_IPV4);
+}
+
+static QETH_DEVICE_ATTR(ipato_del4, del4, 0200, NULL,
+                        qeth_l3_dev_ipato_del4_store);
+
+static ssize_t qeth_l3_dev_ipato_invert6_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return sprintf(buf, "%i\n", card->ipato.invert6? 1:0);
+}
+
+static ssize_t qeth_l3_dev_ipato_invert6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+
+        tmp = strsep((char **) &buf, "\n");
+        if (!strcmp(tmp, "toggle")) {
+                card->ipato.invert6 = (card->ipato.invert6)? 0 : 1;
+        } else if (!strcmp(tmp, "1")) {
+                card->ipato.invert6 = 1;
+        } else if (!strcmp(tmp, "0")) {
+                card->ipato.invert6 = 0;
+        } else {
+                PRINT_WARN("ipato_invert6: write 0, 1 or 'toggle' to "
+                           "this file\n");
+                return -EINVAL;
+        }
+        return count;
+}
+
+static QETH_DEVICE_ATTR(ipato_invert6, invert6, 0644,
+                        qeth_l3_dev_ipato_invert6_show,
+                        qeth_l3_dev_ipato_invert6_store);
+
+
+static ssize_t qeth_l3_dev_ipato_add6_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_ipato_add_show(buf, card, QETH_PROT_IPV6);
+}
+
+static ssize_t qeth_l3_dev_ipato_add6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_ipato_add_store(buf, count, card, QETH_PROT_IPV6);
+}
+
+static QETH_DEVICE_ATTR(ipato_add6, add6, 0644,
+                        qeth_l3_dev_ipato_add6_show,
+                        qeth_l3_dev_ipato_add6_store);
+
+static ssize_t qeth_l3_dev_ipato_del6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_ipato_del_store(buf, count, card, QETH_PROT_IPV6);
+}
+
+static QETH_DEVICE_ATTR(ipato_del6, del6, 0200, NULL,
+                        qeth_l3_dev_ipato_del6_store);
+
+static struct attribute *qeth_ipato_device_attrs[] = {
+        &dev_attr_ipato_enable.attr,
+        &dev_attr_ipato_invert4.attr,
+        &dev_attr_ipato_add4.attr,
+        &dev_attr_ipato_del4.attr,
+        &dev_attr_ipato_invert6.attr,
+        &dev_attr_ipato_add6.attr,
+        &dev_attr_ipato_del6.attr,
+        NULL,
+};
+
+static struct attribute_group qeth_device_ipato_group = {
+        .name = "ipa_takeover",
+        .attrs = qeth_ipato_device_attrs,
+};
+
+static ssize_t qeth_l3_dev_vipa_add_show(char *buf, struct qeth_card *card,
+                        enum qeth_prot_versions proto)
+{
+        struct qeth_ipaddr *ipaddr;
+        char addr_str[40];
+        int entry_len; /* length of 1 entry string, differs between v4 and v6 */
+        unsigned long flags;
+        int i = 0;
+
+        entry_len = (proto == QETH_PROT_IPV4)? 12 : 40;
+        entry_len += 2; /* \n + terminator */
+        spin_lock_irqsave(&card->ip_lock, flags);
+        list_for_each_entry(ipaddr, &card->ip_list, entry) {
+                if (ipaddr->proto != proto)
+                        continue;
+                if (ipaddr->type != QETH_IP_TYPE_VIPA)
+                        continue;
+                /* String must not be longer than PAGE_SIZE. So we check if
+                 * string length gets near PAGE_SIZE. Then we can savely display
+                 * the next IPv6 address (worst case, compared to IPv4) */
+                if ((PAGE_SIZE - i) <= entry_len)
+                        break;
+                qeth_l3_ipaddr_to_string(proto, (const u8 *)&ipaddr->u,
+                        addr_str);
+                i += snprintf(buf + i, PAGE_SIZE - i, "%s\n", addr_str);
+        }
+        spin_unlock_irqrestore(&card->ip_lock, flags);
+        i += snprintf(buf + i, PAGE_SIZE - i, "\n");
+
+        return i;
+}
+
+static ssize_t qeth_l3_dev_vipa_add4_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_vipa_add_show(buf, card, QETH_PROT_IPV4);
+}
+
+static int qeth_l3_parse_vipae(const char *buf, enum qeth_prot_versions proto,
+                 u8 *addr)
+{
+        if (qeth_l3_string_to_ipaddr(buf, proto, addr)) {
+                PRINT_WARN("Invalid IP address format!\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static ssize_t qeth_l3_dev_vipa_add_store(const char *buf, size_t count,
+                        struct qeth_card *card, enum qeth_prot_versions proto)
+{
+        u8 addr[16] = {0, };
+        int rc;
+
+        rc = qeth_l3_parse_vipae(buf, proto, addr);
+        if (rc)
+                return rc;
+
+        rc = qeth_l3_add_vipa(card, proto, addr);
+        if (rc)
+                return rc;
+
+        return count;
+}
+
+static ssize_t qeth_l3_dev_vipa_add4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_vipa_add_store(buf, count, card, QETH_PROT_IPV4);
+}
+
+static QETH_DEVICE_ATTR(vipa_add4, add4, 0644,
+                        qeth_l3_dev_vipa_add4_show,
+                        qeth_l3_dev_vipa_add4_store);
+
+static ssize_t qeth_l3_dev_vipa_del_store(const char *buf, size_t count,
+                         struct qeth_card *card, enum qeth_prot_versions proto)
+{
+        u8 addr[16];
+        int rc;
+
+        rc = qeth_l3_parse_vipae(buf, proto, addr);
+        if (rc)
+                return rc;
+
+        qeth_l3_del_vipa(card, proto, addr);
+
+        return count;
+}
+
+static ssize_t qeth_l3_dev_vipa_del4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_vipa_del_store(buf, count, card, QETH_PROT_IPV4);
+}
+
+static QETH_DEVICE_ATTR(vipa_del4, del4, 0200, NULL,
+                        qeth_l3_dev_vipa_del4_store);
+
+static ssize_t qeth_l3_dev_vipa_add6_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_vipa_add_show(buf, card, QETH_PROT_IPV6);
+}
+
+static ssize_t qeth_l3_dev_vipa_add6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_vipa_add_store(buf, count, card, QETH_PROT_IPV6);
+}
+
+static QETH_DEVICE_ATTR(vipa_add6, add6, 0644,
+                        qeth_l3_dev_vipa_add6_show,
+                        qeth_l3_dev_vipa_add6_store);
+
+static ssize_t qeth_l3_dev_vipa_del6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_vipa_del_store(buf, count, card, QETH_PROT_IPV6);
+}
+
+static QETH_DEVICE_ATTR(vipa_del6, del6, 0200, NULL,
+                        qeth_l3_dev_vipa_del6_store);
+
+static struct attribute *qeth_vipa_device_attrs[] = {
+        &dev_attr_vipa_add4.attr,
+        &dev_attr_vipa_del4.attr,
+        &dev_attr_vipa_add6.attr,
+        &dev_attr_vipa_del6.attr,
+        NULL,
+};
+
+static struct attribute_group qeth_device_vipa_group = {
+        .name = "vipa",
+        .attrs = qeth_vipa_device_attrs,
+};
+
+static ssize_t qeth_l3_dev_rxip_add_show(char *buf, struct qeth_card *card,
+                       enum qeth_prot_versions proto)
+{
+        struct qeth_ipaddr *ipaddr;
+        char addr_str[40];
+        int entry_len; /* length of 1 entry string, differs between v4 and v6 */
+        unsigned long flags;
+        int i = 0;
+
+        entry_len = (proto == QETH_PROT_IPV4)? 12 : 40;
+        entry_len += 2; /* \n + terminator */
+        spin_lock_irqsave(&card->ip_lock, flags);
+        list_for_each_entry(ipaddr, &card->ip_list, entry) {
+                if (ipaddr->proto != proto)
+                        continue;
+                if (ipaddr->type != QETH_IP_TYPE_RXIP)
+                        continue;
+                /* String must not be longer than PAGE_SIZE. So we check if
+                 * string length gets near PAGE_SIZE. Then we can savely display
+                 * the next IPv6 address (worst case, compared to IPv4) */
+                if ((PAGE_SIZE - i) <= entry_len)
+                        break;
+                qeth_l3_ipaddr_to_string(proto, (const u8 *)&ipaddr->u,
+                        addr_str);
+                i += snprintf(buf + i, PAGE_SIZE - i, "%s\n", addr_str);
+        }
+        spin_unlock_irqrestore(&card->ip_lock, flags);
+        i += snprintf(buf + i, PAGE_SIZE - i, "\n");
+
+        return i;
+}
+
+static ssize_t qeth_l3_dev_rxip_add4_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_rxip_add_show(buf, card, QETH_PROT_IPV4);
+}
+
+static int qeth_l3_parse_rxipe(const char *buf, enum qeth_prot_versions proto,
+                 u8 *addr)
+{
+        if (qeth_l3_string_to_ipaddr(buf, proto, addr)) {
+                PRINT_WARN("Invalid IP address format!\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static ssize_t qeth_l3_dev_rxip_add_store(const char *buf, size_t count,
+                        struct qeth_card *card, enum qeth_prot_versions proto)
+{
+        u8 addr[16] = {0, };
+        int rc;
+
+        rc = qeth_l3_parse_rxipe(buf, proto, addr);
+        if (rc)
+                return rc;
+
+        rc = qeth_l3_add_rxip(card, proto, addr);
+        if (rc)
+                return rc;
+
+        return count;
+}
+
+static ssize_t qeth_l3_dev_rxip_add4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_rxip_add_store(buf, count, card, QETH_PROT_IPV4);
+}
+
+static QETH_DEVICE_ATTR(rxip_add4, add4, 0644,
+                        qeth_l3_dev_rxip_add4_show,
+                        qeth_l3_dev_rxip_add4_store);
+
+static ssize_t qeth_l3_dev_rxip_del_store(const char *buf, size_t count,
+                        struct qeth_card *card, enum qeth_prot_versions proto)
+{
+        u8 addr[16];
+        int rc;
+
+        rc = qeth_l3_parse_rxipe(buf, proto, addr);
+        if (rc)
+                return rc;
+
+        qeth_l3_del_rxip(card, proto, addr);
+
+        return count;
+}
+
+static ssize_t qeth_l3_dev_rxip_del4_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_rxip_del_store(buf, count, card, QETH_PROT_IPV4);
+}
+
+static QETH_DEVICE_ATTR(rxip_del4, del4, 0200, NULL,
+                        qeth_l3_dev_rxip_del4_store);
+
+static ssize_t qeth_l3_dev_rxip_add6_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_rxip_add_show(buf, card, QETH_PROT_IPV6);
+}
+
+static ssize_t qeth_l3_dev_rxip_add6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_rxip_add_store(buf, count, card, QETH_PROT_IPV6);
+}
+
+static QETH_DEVICE_ATTR(rxip_add6, add6, 0644,
+                        qeth_l3_dev_rxip_add6_show,
+                        qeth_l3_dev_rxip_add6_store);
+
+static ssize_t qeth_l3_dev_rxip_del6_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        return qeth_l3_dev_rxip_del_store(buf, count, card, QETH_PROT_IPV6);
+}
+
+static QETH_DEVICE_ATTR(rxip_del6, del6, 0200, NULL,
+                        qeth_l3_dev_rxip_del6_store);
+
+static struct attribute *qeth_rxip_device_attrs[] = {
+        &dev_attr_rxip_add4.attr,
+        &dev_attr_rxip_del4.attr,
+        &dev_attr_rxip_add6.attr,
+        &dev_attr_rxip_del6.attr,
+        NULL,
+};
+
+static struct attribute_group qeth_device_rxip_group = {
+        .name = "rxip",
+        .attrs = qeth_rxip_device_attrs,
+};
+
+int qeth_l3_create_device_attributes(struct device *dev)
+{
+        int ret;
+
+        ret = sysfs_create_group(&dev->kobj, &qeth_l3_device_attr_group);
+        if (ret)
+                return ret;
+
+        ret = sysfs_create_group(&dev->kobj, &qeth_device_ipato_group);
+        if (ret) {
+                sysfs_remove_group(&dev->kobj, &qeth_l3_device_attr_group);
+                return ret;
+        }
+
+        ret = sysfs_create_group(&dev->kobj, &qeth_device_vipa_group);
+        if (ret) {
+                sysfs_remove_group(&dev->kobj, &qeth_l3_device_attr_group);
+                sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
+                return ret;
+        }
+
+        ret = sysfs_create_group(&dev->kobj, &qeth_device_rxip_group);
+        if (ret) {
+                sysfs_remove_group(&dev->kobj, &qeth_l3_device_attr_group);
+                sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
+                sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);
+                return ret;
+        }
+        return 0;
+}
+
+void qeth_l3_remove_device_attributes(struct device *dev)
+{
+        sysfs_remove_group(&dev->kobj, &qeth_l3_device_attr_group);
+        sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
+        sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);
+        sysfs_remove_group(&dev->kobj, &qeth_device_rxip_group);
+}