X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=bf8043b6054fffa428fb827321325f16cdfa6f87;hb=f35409904bc4a0a695a4aecb2435933d8a8187fe;hp=d8bd245a175d80ae4a3f78dac0f593b5b865aa66;hpb=2ba9026e2fc114fa50ae923312340e9f08a1f513;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index d8bd245a..bf8043b6 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -171,6 +171,16 @@ errout:
 		rtnl_set_sk_err(net, RTNLGRP_LINK, err);
 }
 
+static void release_dp(struct kobject *kobj)
+{
+	struct datapath *dp = container_of(kobj, struct datapath, ifobj);
+	kfree(dp);
+}
+
+struct kobj_type dp_ktype = {
+	.release = release_dp
+};
+
 static int create_dp(int dp_idx, const char __user *devnamep)
 {
 	struct net_device *dp_dev;
@@ -212,6 +222,13 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 		skb_queue_head_init(&dp->queues[i]);
 	init_waitqueue_head(&dp->waitqueue);
 
+	/* Initialize kobject for bridge.  This will be added as
+	 * /sys/class/net/<devname>/bridge later, if sysfs is enabled. */
+	kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "bridge" */
+	dp->ifobj.kset = NULL;
+	dp->ifobj.parent = NULL;
+	kobject_init(&dp->ifobj, &dp_ktype);
+
 	/* Allocate table. */
 	err = -ENOMEM;
 	rcu_assign_pointer(dp->table, dp_table_create(DP_L1_SIZE));
@@ -284,7 +301,7 @@ static void do_destroy_dp(struct datapath *dp)
 	for (i = 0; i < DP_MAX_GROUPS; i++)
 		kfree(dp->groups[i]);
 	free_percpu(dp->stats_percpu);
-	kfree(dp);
+	kobject_put(&dp->ifobj);
 	module_put(THIS_MODULE);
 }
 
@@ -309,6 +326,19 @@ err_unlock:
 	return err;
 }
 
+static void release_nbp(struct kobject *kobj)
+{
+	struct net_bridge_port *p = container_of(kobj, struct net_bridge_port, kobj);
+	kfree(p);
+}
+
+struct kobj_type brport_ktype = {
+#ifdef SUPPORT_SYSFS
+	.sysfs_ops = &brport_sysfs_ops,
+#endif
+	.release = release_nbp
+};
+
 /* Called with RTNL lock and dp_mutex. */
 static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no)
 {
@@ -338,6 +368,13 @@ static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no)
 	list_add_rcu(&p->node, &dp->port_list);
 	dp->n_ports++;
 
+	/* Initialize kobject for bridge.  This will be added as
+	 * /sys/class/net/<devname>/brport later, if sysfs is enabled. */
+	kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); /* "brport" */
+	p->kobj.kset = NULL;
+	p->kobj.parent = &p->dev->NETDEV_DEV_MEMBER.kobj;
+	kobject_init(&p->kobj, &brport_ktype);
+
 	dp_ifinfo_notify(RTM_NEWLINK, p);
 
 	return 0;
@@ -413,7 +450,7 @@ int dp_del_port(struct net_bridge_port *p)
 
 #ifdef SUPPORT_SYSFS
 	if (p->port_no != ODPP_LOCAL)
-		sysfs_remove_link(&p->dp->ifobj, p->dev->name);
+		dp_sysfs_del_if(p);
 #endif
 	dp_ifinfo_notify(RTM_DELLINK, p);
 
@@ -435,15 +472,10 @@ int dp_del_port(struct net_bridge_port *p)
 	/* Then wait until no one is still using it, and destroy it. */
 	synchronize_rcu();
 
-	if (is_dp_dev(p->dev)) {
+	if (is_dp_dev(p->dev))
 		dp_dev_destroy(p->dev);
-	}
-	if (p->port_no != ODPP_LOCAL) {
-		dp_sysfs_del_if(p);
-	} else {
-		dev_put(p->dev);
-		kfree(p);
-	}
+	dev_put(p->dev);
+	kobject_put(&p->kobj);
 
 	return 0;
 }