X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=1415833fdda4a756b32e9194f637a1751324a76c;hb=9fe3b9a2eeace9689def807e78e35c79e4b1814b;hp=d5a274981f9ea077ab91b570e3fe35b838bc4c5e;hpb=1d87357a1322c2faa290452c08c7f794c0be848b;p=openvswitch

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index d5a27498..1415833f 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * kernel, by Linus Torvalds and others.
@@ -11,40 +11,48 @@
 #include <linux/netdevice.h>
 
 #include "datapath.h"
-#include "dp_dev.h"
+#include "vport-internal_dev.h"
+#include "vport-netdev.h"
 
-static int dp_device_event(struct notifier_block *unused, unsigned long event, 
-		void *ptr) 
+static int dp_device_event(struct notifier_block *unused, unsigned long event,
+		void *ptr)
 {
 	struct net_device *dev = ptr;
-	struct net_bridge_port *p;
+	struct vport *vport;
 	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)
+	if (is_internal_dev(dev))
+		vport = internal_dev_get_vport(dev);
+	else
+		vport = netdev_get_vport(dev);
+
+	if (!vport)
 		return NOTIFY_DONE;
-	dp = p->dp;
+
+	dp = vport->dp;
 
 	switch (event) {
 	case NETDEV_UNREGISTER:
-		mutex_lock(&dp->mutex);
-		dp_del_port(p);
-		mutex_unlock(&dp->mutex);
+		if (!is_internal_dev(dev)) {
+			mutex_lock(&dp->mutex);
+			dp_detach_port(vport);
+			mutex_unlock(&dp->mutex);
+		}
 		break;
 
 	case NETDEV_CHANGENAME:
-		if (p->port_no != ODPP_LOCAL) {
+		if (vport->port_no != ODPP_LOCAL) {
 			mutex_lock(&dp->mutex);
-			dp_sysfs_del_if(p);
-			dp_sysfs_add_if(p);
+			dp_sysfs_del_if(vport);
+			dp_sysfs_add_if(vport);
 			mutex_unlock(&dp->mutex);
 		}
 		break;
+
+	case NETDEV_CHANGEMTU:
+		if (!is_internal_dev(dev))
+			set_internal_devs_mtu(dp);
+		break;
 	}
 	return NOTIFY_DONE;
 }