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

1 files changed, 116 insertions, 9 deletions

diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index c144b9924d52..25b3e7aae44f 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -8,6 +8,8 @@
  *               Frank Blaschka <frank.blaschka@de.ibm.com>
  */
 
+#include <linux/slab.h>
+
 #include "qeth_l3.h"
 
 #define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \
@@ -293,31 +295,134 @@ 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);
+        enum qeth_checksum_types csum_type;
         char *tmp;
+        int rc;
 
         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;
+                csum_type = SW_CHECKSUMMING;
         else if (!strcmp(tmp, "hw_checksumming"))
-                card->options.checksum_type = HW_CHECKSUMMING;
+                csum_type = HW_CHECKSUMMING;
         else if (!strcmp(tmp, "no_checksumming"))
-                card->options.checksum_type = NO_CHECKSUMMING;
-        else {
+                csum_type = NO_CHECKSUMMING;
+        else
                 return -EINVAL;
-        }
+
+        rc = qeth_l3_set_rx_csum(card, csum_type);
+        if (rc)
+                return rc;
         return count;
 }
 
 static DEVICE_ATTR(checksumming, 0644, qeth_l3_dev_checksum_show,
                 qeth_l3_dev_checksum_store);
 
+static ssize_t qeth_l3_dev_sniffer_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.sniffer ? 1 : 0);
+}
+
+static ssize_t qeth_l3_dev_sniffer_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        int ret;
+        unsigned long i;
+
+        if (!card)
+                return -EINVAL;
+
+        if (card->info.type != QETH_CARD_TYPE_IQD)
+                return -EPERM;
+
+        if ((card->state != CARD_STATE_DOWN) &&
+            (card->state != CARD_STATE_RECOVER))
+                return -EPERM;
+
+        ret = strict_strtoul(buf, 16, &i);
+        if (ret)
+                return -EINVAL;
+        switch (i) {
+        case 0:
+                card->options.sniffer = i;
+                break;
+        case 1:
+                ret = qdio_get_ssqd_desc(CARD_DDEV(card), &card->ssqd);
+                if (card->ssqd.qdioac2 & QETH_SNIFF_AVAIL) {
+                        card->options.sniffer = i;
+                        if (card->qdio.init_pool.buf_count !=
+                                        QETH_IN_BUF_COUNT_MAX)
+                                qeth_realloc_buffer_pool(card,
+                                        QETH_IN_BUF_COUNT_MAX);
+                        break;
+                } else
+                        return -EPERM;
+        default:   /* fall through */
+                return -EINVAL;
+        }
+        return count;
+}
+
+static DEVICE_ATTR(sniffer, 0644, qeth_l3_dev_sniffer_show,
+                qeth_l3_dev_sniffer_store);
+
+static ssize_t qeth_l3_dev_large_send_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+
+        if (!card)
+                return -EINVAL;
+
+        switch (card->options.large_send) {
+        case QETH_LARGE_SEND_NO:
+                return sprintf(buf, "%s\n", "no");
+        case QETH_LARGE_SEND_TSO:
+                return sprintf(buf, "%s\n", "TSO");
+        default:
+                return sprintf(buf, "%s\n", "N/A");
+        }
+}
+
+static ssize_t qeth_l3_dev_large_send_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct qeth_card *card = dev_get_drvdata(dev);
+        enum qeth_large_send_types type;
+        int rc = 0;
+        char *tmp;
+
+        if (!card)
+                return -EINVAL;
+        tmp = strsep((char **) &buf, "\n");
+        if (!strcmp(tmp, "no"))
+                type = QETH_LARGE_SEND_NO;
+        else if (!strcmp(tmp, "TSO"))
+                type = QETH_LARGE_SEND_TSO;
+        else
+                return -EINVAL;
+
+        if (card->options.large_send == type)
+                return count;
+        rc = qeth_l3_set_large_send(card, type);
+        if (rc)
+                return rc;
+        return count;
+}
+
+static DEVICE_ATTR(large_send, 0644, qeth_l3_dev_large_send_show,
+                   qeth_l3_dev_large_send_store);
+
 static struct attribute *qeth_l3_device_attrs[] = {
         &dev_attr_route4.attr,
         &dev_attr_route6.attr,
@@ -325,6 +430,8 @@ static struct attribute *qeth_l3_device_attrs[] = {
         &dev_attr_broadcast_mode.attr,
         &dev_attr_canonical_macaddr.attr,
         &dev_attr_checksumming.attr,
+        &dev_attr_sniffer.attr,
+        &dev_attr_large_send.attr,
         NULL,
 };