X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=7b3b219ac2a97fcd1f0f7a8b4a2826e7231b01a4;hb=e7ed3a3a5f87d20f0cc632ae23adba6f30a4e19d;hp=1415833fdda4a756b32e9194f637a1751324a76c;hpb=7237e4f4b6155eb4854cebc0a45fe845f0950b40;p=openvswitch diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c index 1415833f..7b3b219a 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, 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. @@ -9,6 +9,7 @@ /* Handle changes to managed devices */ #include +#include #include "datapath.h" #include "vport-internal_dev.h" @@ -34,18 +35,28 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event, switch (event) { case NETDEV_UNREGISTER: if (!is_internal_dev(dev)) { - mutex_lock(&dp->mutex); + struct sk_buff *reply; + dp_detach_port(vport); - mutex_unlock(&dp->mutex); + reply = ovs_vport_cmd_build_info(vport, 0, 0, + OVS_VPORT_CMD_DEL); + if (IS_ERR(reply)) { + netlink_set_err(INIT_NET_GENL_SOCK, 0, + dp_vport_multicast_group.id, + PTR_ERR(reply)); + break; + } + + genl_notify(reply, dev_net(dev), 0, + dp_vport_multicast_group.id, NULL, + GFP_KERNEL); } break; case NETDEV_CHANGENAME: - if (vport->port_no != ODPP_LOCAL) { - mutex_lock(&dp->mutex); + if (vport->port_no != OVSP_LOCAL) { dp_sysfs_del_if(vport); dp_sysfs_add_if(vport); - mutex_unlock(&dp->mutex); } break;