X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=d5a274981f9ea077ab91b570e3fe35b838bc4c5e;hb=1901968e76429f834fa88a3494be768002089645;hp=6203470e566102ff298dca1fa65064c87fb22d55;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=sliver-openvswitch.git

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 6203470e5..d5a274981 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -11,18 +11,40 @@
 #include <linux/netdevice.h>
 
 #include "datapath.h"
-
+#include "dp_dev.h"
 
 static int dp_device_event(struct notifier_block *unused, unsigned long event, 
 		void *ptr) 
 {
 	struct net_device *dev = ptr;
-	struct net_bridge_port *p = dev->br_port;
-	if (event == NETDEV_UNREGISTER && p) {
-		struct datapath *dp = p->dp;
+	struct net_bridge_port *p;
+	struct datapath *dp;
+
+	if (is_dp_dev(dev)) {
+		struct dp_dev *dp_dev = dp_dev_priv(dev);
+		p = dp_dev->dp->ports[dp_dev->port_no];
+	} else {
+		p = dev->br_port;
+	}
+	if (!p)
+		return NOTIFY_DONE;
+	dp = p->dp;
+
+	switch (event) {
+	case NETDEV_UNREGISTER:
 		mutex_lock(&dp->mutex);
-		dp_del_port(p, NULL);
+		dp_del_port(p);
 		mutex_unlock(&dp->mutex);
+		break;
+
+	case NETDEV_CHANGENAME:
+		if (p->port_no != ODPP_LOCAL) {
+			mutex_lock(&dp->mutex);
+			dp_sysfs_del_if(p);
+			dp_sysfs_add_if(p);
+			mutex_unlock(&dp->mutex);
+		}
+		break;
 	}
 	return NOTIFY_DONE;
 }