X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=94d671dd37a13df626de6b29c84cd9fbf2f3c6b5;hb=df2c07f4338faac04f4969f243fe4e8083b309ac;hp=0278988d69a08bbc4e753e28d0ad26c05880ce92;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=openvswitch diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c index 0278988d..94d671dd 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, 2011 Nicira Networks. * * Significant portions of this file may be copied from parts of the Linux * kernel, by Linus Torvalds and others. @@ -11,47 +11,42 @@ #include #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)) + 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 != OVSP_LOCAL) { + dp_sysfs_del_if(vport); + dp_sysfs_add_if(vport); } break; case NETDEV_CHANGEMTU: - if (!is_dp_dev(dev)) { - mutex_lock(&dp->mutex); - set_dp_devs_mtu(dp, dev); - mutex_unlock(&dp->mutex); - } + if (!is_internal_dev(dev)) + set_internal_devs_mtu(dp); break; } return NOTIFY_DONE;