X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_sysfs_dp.c;h=503f22e96983425735fdbb6492588e0bd6c64936;hb=2e8873af89047bc4093ad8f2755867af632b9363;hp=5764a3a356dbf73a982f63b6f2a8ba8dc7a28ef4;hpb=3de35df914e39692470a5d4546cb1fae2d93a316;p=openvswitch

diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c
index 5764a3a3..503f22e9 100644
--- a/datapath/dp_sysfs_dp.c
+++ b/datapath/dp_sysfs_dp.c
@@ -460,7 +460,7 @@ static struct attribute *bridge_attrs[] = {
 };
 
 static struct attribute_group bridge_group = {
-	.name = SYSFS_BRIDGE_ATTR,
+	.name = SYSFS_BRIDGE_ATTR, /* "bridge" */
 	.attrs = bridge_attrs,
 };
 
@@ -479,6 +479,7 @@ int dp_sysfs_add_dp(struct datapath *dp)
 	struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev);
 	int err;
 
+	/* Create /sys/class/net/<devname>/bridge directory. */
 	err = sysfs_create_group(kobj, &bridge_group);
 	if (err) {
 		pr_info("%s: can't create group %s/%s\n",
@@ -486,13 +487,8 @@ int dp_sysfs_add_dp(struct datapath *dp)
 		goto out1;
 	}
 
-	/* Create /sys/class/net/<devname>/bridge directory. */
-	kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "bridge" */
-	dp->ifobj.ktype = NULL;
-	dp->ifobj.kset = NULL;
+	/* Create /sys/class/net/<devname>/brif directory. */
 	dp->ifobj.parent = kobj;
-	kboject_init(&dp->ifobj);
-
 	err = kobject_add(&dp->ifobj);
 	if (err) {
 		pr_info("%s: can't add kobject (directory) %s/%s\n",
@@ -513,7 +509,6 @@ int dp_sysfs_del_dp(struct datapath *dp)
 	struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev);
 
 	kobject_del(&dp->ifobj);
-	kobject_put(&dp->ifobj);
 	sysfs_remove_group(kobj, &bridge_group);
 
 	return 0;