xenserver: Use = instead of == as operator for "test" in shell scripts.
[openvswitch] / datapath / datapath.c
index f4284edce58c567d3799e9ebe08698138d0d5561..f506324c1d9282bb2128e96fca2f20526cb1e70d 100644 (file)
@@ -223,8 +223,8 @@ static int create_dp(int dp_idx, const char __user *devnamep)
        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" */
+        * /sys/class/net/<devname>/brif later, if sysfs is enabled. */
+       kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "brif" */
        dp->ifobj.kset = NULL;
        dp->ifobj.parent = NULL;
        kobject_init(&dp->ifobj, &dp_ktype);
@@ -450,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);
 
@@ -474,8 +474,6 @@ int dp_del_port(struct net_bridge_port *p)
 
        if (is_dp_dev(p->dev))
                dp_dev_destroy(p->dev);
-       if (p->port_no != ODPP_LOCAL)
-               dp_sysfs_del_if(p);
        dev_put(p->dev);
        kobject_put(&p->kobj);