Release Open vSwitch 1.1.0

[sliver-openvswitch.git] / datapath / dp_notify.c

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 1843d75..8c54d68 100644 (file)
--- 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, 2010 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * kernel, by Linus Torvalds and others.
@@ -19,7 +19,6 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 {
        struct net_device *dev = ptr;
        struct vport *vport;
-       struct dp_port *p;
        struct datapath *dp;
 
        if (is_internal_dev(dev))
@@ -30,25 +29,18 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
        if (!vport)
                return NOTIFY_DONE;
 
-       p = vport_get_dp_port(vport);
-
-       if (!p)
-               return NOTIFY_DONE;
-       dp = p->dp;
+       dp = vport->dp;
 
        switch (event) {
        case NETDEV_UNREGISTER:
-               mutex_lock(&dp->mutex);
-               dp_detach_port(p);
-               mutex_unlock(&dp->mutex);
+               if (!is_internal_dev(dev))
+                       dp_detach_port(vport);
                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);
+               if (vport->port_no != ODPP_LOCAL) {
+                       dp_sysfs_del_if(vport);
+                       dp_sysfs_add_if(vport);
                }
                break;