datapath: struct brport_attribute no longer has an owner element

Between 2.6.35 and 2.6.36-rc1 the owner element of struct brport_attribute
was removed.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index 8aa03a7672f993b8f5a618b544b2ed18f4e421b1..3c842172bf7689f1dbfd34824c2bcc1a77610f0c 100644 (file)
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -30,6 +30,15 @@ struct brport_attribute {
        ssize_t (*store)(struct dp_port *, unsigned long);
 };
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#define BRPORT_ATTR(_name,_mode,_show,_store)                  \
+struct brport_attribute brport_attr_##_name = {                        \
+       .attr = {.name = __stringify(_name),                    \
+                .mode = _mode },                               \
+       .show   = _show,                                        \
+       .store  = _store,                                       \
+};
+#else
 #define BRPORT_ATTR(_name,_mode,_show,_store)                  \
 struct brport_attribute brport_attr_##_name = {                \
        .attr = {.name = __stringify(_name),                    \
@@ -38,6 +47,7 @@ struct brport_attribute brport_attr_##_name = {               \
        .show   = _show,                                        \
        .store  = _store,                                       \
 };
+#endif
 
 static ssize_t show_path_cost(struct dp_port *p, char *buf)
 {