X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_if.c;h=c688bc4b1656f49926e04b7f4e86c0b50882f2a8;hb=c100c5cadcfbaf2fb55720f94c385cc0955a520a;hp=e06037cbe5be94d8e06b2199b6974d80a6f428e9;hpb=f2459fe7d91c4c325dfaa3ed18f56200b63ae27e;p=sliver-openvswitch.git

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index e06037cbe..c688bc4b1 100644
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -17,7 +17,6 @@
 #include <linux/netdevice.h>
 #include <linux/if_bridge.h>
 #include <linux/rtnetlink.h>
-#include <linux/spinlock.h>
 
 #include "datapath.h"
 #include "dp_sysfs.h"
@@ -27,10 +26,19 @@
 
 struct brport_attribute {
 	struct attribute	attr;
-	ssize_t (*show)(struct dp_port *, char *);
-	ssize_t (*store)(struct dp_port *, unsigned long);
+	ssize_t (*show)(struct vport *, char *);
+	ssize_t (*store)(struct vport *, 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), 			\
@@ -39,162 +47,103 @@ struct brport_attribute brport_attr_##_name = { 	        \
 	.show	= _show,					\
 	.store	= _store,					\
 };
+#endif
 
-static ssize_t show_path_cost(struct dp_port *p, char *buf)
+static ssize_t show_path_cost(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->path_cost);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
-static ssize_t store_path_cost(struct dp_port *p, unsigned long v)
+static ssize_t store_path_cost(struct vport *p, unsigned long v)
 {
-#if 0
-	br_stp_set_path_cost(p, v);
-#endif
 	return 0;
 }
 static BRPORT_ATTR(path_cost, S_IRUGO | S_IWUSR,
 		   show_path_cost, store_path_cost);
 
-static ssize_t show_priority(struct dp_port *p, char *buf)
+static ssize_t show_priority(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->priority);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
-static ssize_t store_priority(struct dp_port *p, unsigned long v)
+static ssize_t store_priority(struct vport *p, unsigned long v)
 {
-#if 0
-	if (v >= (1<<(16-BR_PORT_BITS)))
-		return -ERANGE;
-	br_stp_set_port_priority(p, v);
-#endif
 	return 0;
 }
 static BRPORT_ATTR(priority, S_IRUGO | S_IWUSR,
 			 show_priority, store_priority);
 
-static ssize_t show_designated_root(struct dp_port *p, char *buf)
+static ssize_t show_designated_root(struct vport *p, char *buf)
 {
-#if 0
-	return br_show_bridge_id(buf, &p->designated_root);
-#else
 	return sprintf(buf, "0000.010203040506\n");
-#endif
 }
 static BRPORT_ATTR(designated_root, S_IRUGO, show_designated_root, NULL);
 
-static ssize_t show_designated_bridge(struct dp_port *p, char *buf)
+static ssize_t show_designated_bridge(struct vport *p, char *buf)
 {
-#if 0
-	return br_show_bridge_id(buf, &p->designated_bridge);
-#else
 	return sprintf(buf, "0000.060504030201\n");
-#endif
 }
 static BRPORT_ATTR(designated_bridge, S_IRUGO, show_designated_bridge, NULL);
 
-static ssize_t show_designated_port(struct dp_port *p, char *buf)
+static ssize_t show_designated_port(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->designated_port);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(designated_port, S_IRUGO, show_designated_port, NULL);
 
-static ssize_t show_designated_cost(struct dp_port *p, char *buf)
+static ssize_t show_designated_cost(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->designated_cost);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(designated_cost, S_IRUGO, show_designated_cost, NULL);
 
-static ssize_t show_port_id(struct dp_port *p, char *buf)
+static ssize_t show_port_id(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "0x%x\n", p->port_id);
-#else
 	return sprintf(buf, "0x%x\n", 0);
-#endif
 }
 static BRPORT_ATTR(port_id, S_IRUGO, show_port_id, NULL);
 
-static ssize_t show_port_no(struct dp_port *p, char *buf)
+static ssize_t show_port_no(struct vport *p, char *buf)
 {
 	return sprintf(buf, "0x%x\n", p->port_no);
 }
 
 static BRPORT_ATTR(port_no, S_IRUGO, show_port_no, NULL);
 
-static ssize_t show_change_ack(struct dp_port *p, char *buf)
+static ssize_t show_change_ack(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->topology_change_ack);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(change_ack, S_IRUGO, show_change_ack, NULL);
 
-static ssize_t show_config_pending(struct dp_port *p, char *buf)
+static ssize_t show_config_pending(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->config_pending);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(config_pending, S_IRUGO, show_config_pending, NULL);
 
-static ssize_t show_port_state(struct dp_port *p, char *buf)
+static ssize_t show_port_state(struct vport *p, char *buf)
 {
-#if 0
-	return sprintf(buf, "%d\n", p->state);
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(state, S_IRUGO, show_port_state, NULL);
 
-static ssize_t show_message_age_timer(struct dp_port *p,
+static ssize_t show_message_age_timer(struct vport *p,
 					    char *buf)
 {
-#if 0
-	return sprintf(buf, "%ld\n", br_timer_value(&p->message_age_timer));
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(message_age_timer, S_IRUGO, show_message_age_timer, NULL);
 
-static ssize_t show_forward_delay_timer(struct dp_port *p,
+static ssize_t show_forward_delay_timer(struct vport *p,
 					    char *buf)
 {
-#if 0
-	return sprintf(buf, "%ld\n", br_timer_value(&p->forward_delay_timer));
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(forward_delay_timer, S_IRUGO, show_forward_delay_timer, NULL);
 
-static ssize_t show_hold_timer(struct dp_port *p,
+static ssize_t show_hold_timer(struct vport *p,
 					    char *buf)
 {
-#if 0
-	return sprintf(buf, "%ld\n", br_timer_value(&p->hold_timer));
-#else
 	return sprintf(buf, "%d\n", 0);
-#endif
 }
 static BRPORT_ATTR(hold_timer, S_IRUGO, show_hold_timer, NULL);
 
@@ -216,14 +165,14 @@ static struct brport_attribute *brport_attrs[] = {
 	NULL
 };
 
-#define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr)
-#define to_brport(obj)	container_of(obj, struct dp_port, kobj)
+#define to_vport_attr(_at) container_of(_at, struct brport_attribute, attr)
+#define to_vport(obj)	container_of(obj, struct vport, kobj)
 
 static ssize_t brport_show(struct kobject * kobj,
 			   struct attribute * attr, char * buf)
 {
-	struct brport_attribute * brport_attr = to_brport_attr(attr);
-	struct dp_port * p = to_brport(kobj);
+	struct brport_attribute * brport_attr = to_vport_attr(attr);
+	struct vport * p = to_vport(kobj);
 
 	return brport_attr->show(p, buf);
 }
@@ -232,34 +181,15 @@ static ssize_t brport_store(struct kobject * kobj,
 			    struct attribute * attr,
 			    const char * buf, size_t count)
 {
-	struct dp_port * p = to_brport(kobj);
-#if 0
-	struct brport_attribute * brport_attr = to_brport_attr(attr);
-	char *endp;
-	unsigned long val;
-#endif
+	struct vport * p = to_vport(kobj);
 	ssize_t ret = -EINVAL;
 
 	if (!capable(CAP_NET_ADMIN))
 		return -EPERM;
 
-#if 0
-	val = simple_strtoul(buf, &endp, 0);
-	if (endp != buf) {
-		rtnl_lock();
-		if (p->dev && p->br && brport_attr->store) {
-			spin_lock_bh(&p->br->lock);
-			ret = brport_attr->store(p, val);
-			spin_unlock_bh(&p->br->lock);
-			if (ret == 0)
-				ret = count;
-		}
-		rtnl_unlock();
-	}
-#else
-	printk("%s: xxx writing port parms not supported yet!\n", 
+	printk("%s: xxx writing port parms not supported yet!\n",
 	       dp_name(p->dp));
-#endif
+
 	return ret;
 }
 
@@ -273,9 +203,9 @@ struct sysfs_ops brport_sysfs_ops = {
  * Creates a brport subdirectory with bridge attributes.
  * Puts symlink in bridge's brport subdirectory
  */
-int dp_sysfs_add_if(struct dp_port *p)
+int dp_sysfs_add_if(struct vport *p)
 {
-	struct kobject *kobj = vport_get_kobj(p->vport);
+	struct kobject *kobj = vport_get_kobj(p);
 	struct datapath *dp = p->dp;
 	struct brport_attribute **a;
 	int err;
@@ -290,8 +220,9 @@ int dp_sysfs_add_if(struct dp_port *p)
 
 	/* Create symlink from /sys/class/net/<devname>/brport/bridge to
 	 * /sys/class/net/<bridgename>. */
-	err = sysfs_create_link(&p->kobj, vport_get_kobj(dp->ports[ODPP_LOCAL]->vport),
-				SYSFS_BRIDGE_PORT_LINK); /* "bridge" */
+	err = sysfs_create_link(&p->kobj,
+		vport_get_kobj(rtnl_dereference(dp->ports[ODPP_LOCAL])),
+		SYSFS_BRIDGE_PORT_LINK); /* "bridge" */
 	if (err)
 		goto err_del;
 
@@ -304,10 +235,10 @@ int dp_sysfs_add_if(struct dp_port *p)
 
 	/* Create symlink from /sys/class/net/<bridgename>/brif/<devname> to
 	 * /sys/class/net/<devname>/brport.  */
-	err = sysfs_create_link(&dp->ifobj, &p->kobj, vport_get_name(p->vport));
+	err = sysfs_create_link(&dp->ifobj, &p->kobj, vport_get_name(p));
 	if (err)
 		goto err_del;
-	strcpy(p->linkname, vport_get_name(p->vport));
+	strcpy(p->linkname, vport_get_name(p));
 
 	kobject_uevent(&p->kobj, KOBJ_ADD);
 
@@ -320,7 +251,7 @@ err:
 	return err;
 }
 
-int dp_sysfs_del_if(struct dp_port *p)
+int dp_sysfs_del_if(struct vport *p)
 {
 	if (p->linkname[0]) {
 		sysfs_remove_link(&p->dp->ifobj, p->linkname);