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

6 files changed, 68 insertions, 48 deletions

diff --git a/drivers/uwb/wlp/eda.c b/drivers/uwb/wlp/eda.c
index 69e020039718..086fc0cf9401 100644
--- a/drivers/uwb/wlp/eda.c
+++ b/drivers/uwb/wlp/eda.c
@@ -53,6 +53,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/slab.h>
 #include <linux/wlp.h>
 #include "wlp-internal.h"
 
diff --git a/drivers/uwb/wlp/messages.c b/drivers/uwb/wlp/messages.c
index aa42fcee4c4f..3a8e033dce21 100644
--- a/drivers/uwb/wlp/messages.c
+++ b/drivers/uwb/wlp/messages.c
@@ -24,6 +24,7 @@
  */
 
 #include <linux/wlp.h>
+#include <linux/slab.h>
 
 #include "wlp-internal.h"
 
@@ -259,6 +260,63 @@ out:
 }
 
 
+static ssize_t wlp_get_attribute(struct wlp *wlp, u16 type_code,
+        struct wlp_attr_hdr *attr_hdr, void *value, ssize_t value_len,
+        ssize_t buflen)
+{
+        struct device *dev = &wlp->rc->uwb_dev.dev;
+        ssize_t attr_len = sizeof(*attr_hdr) + value_len;
+        if (buflen < 0)
+                return -EINVAL;
+        if (buflen < attr_len) {
+                dev_err(dev, "WLP: Not enough space in buffer to parse"
+                        " attribute field. Need %d, received %zu\n",
+                        (int)attr_len, buflen);
+                return -EIO;
+        }
+        if (wlp_check_attr_hdr(wlp, attr_hdr, type_code, value_len) < 0) {
+                dev_err(dev, "WLP: Header verification failed. \n");
+                return -EINVAL;
+        }
+        memcpy(value, (void *)attr_hdr + sizeof(*attr_hdr), value_len);
+        return attr_len;
+}
+
+static ssize_t wlp_vget_attribute(struct wlp *wlp, u16 type_code,
+        struct wlp_attr_hdr *attr_hdr, void *value, ssize_t max_value_len,
+        ssize_t buflen)
+{
+        struct device *dev = &wlp->rc->uwb_dev.dev;
+        size_t len;
+        if (buflen < 0)
+                return -EINVAL;
+        if (buflen < sizeof(*attr_hdr)) {
+                dev_err(dev, "WLP: Not enough space in buffer to parse"
+                        " header.\n");
+                return -EIO;
+        }
+        if (le16_to_cpu(attr_hdr->type) != type_code) {
+                dev_err(dev, "WLP: Unexpected attribute type. Got %u, "
+                        "expected %u.\n", le16_to_cpu(attr_hdr->type),
+                        type_code);
+                return -EINVAL;
+        }
+        len = le16_to_cpu(attr_hdr->length);
+        if (len > max_value_len) {
+                dev_err(dev, "WLP: Attribute larger than maximum "
+                        "allowed. Received %zu, max is %d.\n", len,
+                        (int)max_value_len);
+                return -EFBIG;
+        }
+        if (buflen < sizeof(*attr_hdr) + len) {
+                dev_err(dev, "WLP: Not enough space in buffer to parse "
+                        "variable data.\n");
+                return -EIO;
+        }
+        memcpy(value, (void *)attr_hdr + sizeof(*attr_hdr), len);
+        return sizeof(*attr_hdr) + len;
+}
+
 /**
  * Get value of attribute from fixed size attribute field.
  *
@@ -274,22 +332,8 @@ out:
 ssize_t wlp_get_##name(struct wlp *wlp, struct wlp_attr_##name *attr,   \
                       type *value, ssize_t buflen)                      \
 {                                                                       \
-        struct device *dev = &wlp->rc->uwb_dev.dev;                     \
-        if (buflen < 0)                                                 \
-                return -EINVAL;                                         \
-        if (buflen < sizeof(*attr)) {                                   \
-                dev_err(dev, "WLP: Not enough space in buffer to parse" \
-                        " attribute field. Need %d, received %zu\n",    \
-                        (int)sizeof(*attr), buflen);                    \
-                return -EIO;                                            \
-        }                                                               \
-        if (wlp_check_attr_hdr(wlp, &attr->hdr, type_code,              \
-                               sizeof(attr->name)) < 0) {               \
-                dev_err(dev, "WLP: Header verification failed. \n");    \
-                return -EINVAL;                                         \
-        }                                                               \
-        *value = attr->name;                                            \
-        return sizeof(*attr);                                           \
+        return wlp_get_attribute(wlp, (type_code), &attr->hdr,          \
+                                 value, sizeof(*value), buflen);        \
 }
 
 #define wlp_get_sparse(type, type_code, name) \
@@ -313,35 +357,8 @@ static ssize_t wlp_get_##name(struct wlp *wlp,				\
                               struct wlp_attr_##name *attr,             \
                               type_val *value, ssize_t buflen)          \
 {                                                                       \
-        struct device *dev = &wlp->rc->uwb_dev.dev;                     \
-        size_t len;                                                     \
-        if (buflen < 0)                                                 \
-                return -EINVAL;                                         \
-        if (buflen < sizeof(*attr)) {                                   \
-                dev_err(dev, "WLP: Not enough space in buffer to parse" \
-                        " header.\n");                                  \
-                return -EIO;                                            \
-        }                                                               \
-        if (le16_to_cpu(attr->hdr.type) != type_code) {                 \
-                dev_err(dev, "WLP: Unexpected attribute type. Got %u, " \
-                        "expected %u.\n", le16_to_cpu(attr->hdr.type),  \
-                        type_code);                                     \
-                return -EINVAL;                                         \
-        }                                                               \
-        len = le16_to_cpu(attr->hdr.length);                            \
-        if (len > max) {                                                \
-                dev_err(dev, "WLP: Attribute larger than maximum "      \
-                        "allowed. Received %zu, max is %d.\n", len,     \
-                        (int)max);                                      \
-                return -EFBIG;                                          \
-        }                                                               \
-        if (buflen < sizeof(*attr) + len) {                             \
-                dev_err(dev, "WLP: Not enough space in buffer to parse "\
-                        "variable data.\n");                            \
-                return -EIO;                                            \
-        }                                                               \
-        memcpy(value, (void *) attr + sizeof(*attr), len);              \
-        return sizeof(*attr) + len;                                     \
+        return wlp_vget_attribute(wlp, (type_code), &attr->hdr,         \
+                              value, (max), buflen);                    \
 }
 
 wlp_get(u8, WLP_ATTR_WLP_VER, version)
diff --git a/drivers/uwb/wlp/sysfs.c b/drivers/uwb/wlp/sysfs.c
index 0370399ff4bb..6627c94cc854 100644
--- a/drivers/uwb/wlp/sysfs.c
+++ b/drivers/uwb/wlp/sysfs.c
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr,
         return ret;
 }
 
-static
-struct sysfs_ops wss_sysfs_ops = {
+static const struct sysfs_ops wss_sysfs_ops = {
         .show   = wlp_wss_attr_show,
         .store  = wlp_wss_attr_store,
 };
diff --git a/drivers/uwb/wlp/txrx.c b/drivers/uwb/wlp/txrx.c
index 86a853b84119..05dde44b3592 100644
--- a/drivers/uwb/wlp/txrx.c
+++ b/drivers/uwb/wlp/txrx.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/etherdevice.h>
+#include <linux/slab.h>
 #include <linux/wlp.h>
 
 #include "wlp-internal.h"
@@ -282,7 +283,7 @@ EXPORT_SYMBOL_GPL(wlp_receive_frame);
  *         and transmission will be done by the calling function.
  * @dst:   On return this will contain the device address to which the
  *         frame is destined.
- * @returns: 0 on success no tx : WLP header sucessfully applied to skb buffer,
+ * @returns: 0 on success no tx : WLP header successfully applied to skb buffer,
  *                                calling function can proceed with tx
  *           1 on success with tx : WLP will take over transmission of this
  *                                  frame
diff --git a/drivers/uwb/wlp/wlp-lc.c b/drivers/uwb/wlp/wlp-lc.c
index 13db739c4e39..7f6a630bf26c 100644
--- a/drivers/uwb/wlp/wlp-lc.c
+++ b/drivers/uwb/wlp/wlp-lc.c
@@ -22,6 +22,7 @@
  * FIXME: docs
  */
 #include <linux/wlp.h>
+#include <linux/slab.h>
 
 #include "wlp-internal.h"
 
diff --git a/drivers/uwb/wlp/wss-lc.c b/drivers/uwb/wlp/wss-lc.c
index 5913c7a5d922..90accdd54c07 100644
--- a/drivers/uwb/wlp/wss-lc.c
+++ b/drivers/uwb/wlp/wss-lc.c
@@ -45,6 +45,7 @@
  */
 #include <linux/etherdevice.h> /* for is_valid_ether_addr */
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/wlp.h>
 
 #include "wlp-internal.h"