X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=48023a9d8f47fc5ae67e8497ad6db794d9f9f1bf;hb=a256b6e5a98ed6368a83a82a79d4f69f8040c68d;hp=122b2fa989a9838f9d3940a6afae64c8a96c77c1;hpb=a9a29d22d8f485bb90bb49ae9ddff8c3c1ab04f5;p=sliver-openvswitch.git

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 122b2fa98..48023a9d8 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira Networks.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -24,53 +24,51 @@
 #include "vport-netdev.h"
 
 static int dp_device_event(struct notifier_block *unused, unsigned long event,
-		void *ptr)
+			   void *ptr)
 {
 	struct net_device *dev = ptr;
 	struct vport *vport;
-	struct datapath *dp;
 
-	if (is_internal_dev(dev))
-		vport = internal_dev_get_vport(dev);
+	if (ovs_is_internal_dev(dev))
+		vport = ovs_internal_dev_get_vport(dev);
 	else
-		vport = netdev_get_vport(dev);
+		vport = ovs_netdev_get_vport(dev);
 
 	if (!vport)
 		return NOTIFY_DONE;
 
-	dp = vport->dp;
-
 	switch (event) {
 	case NETDEV_UNREGISTER:
-		if (!is_internal_dev(dev)) {
-			struct sk_buff *reply;
+		if (!ovs_is_internal_dev(dev)) {
+			struct sk_buff *notify;
 
-			reply = ovs_vport_cmd_build_info(vport, 0, 0,
-							 OVS_VPORT_CMD_DEL);
-			dp_detach_port(vport);
-			if (IS_ERR(reply)) {
-				netlink_set_err(INIT_NET_GENL_SOCK, 0,
-						dp_vport_multicast_group.id,
-						PTR_ERR(reply));
+			notify = ovs_vport_cmd_build_info(vport, 0, 0,
+							  OVS_VPORT_CMD_DEL);
+			ovs_dp_detach_port(vport);
+			if (IS_ERR(notify)) {
+				netlink_set_err(GENL_SOCK(ovs_dp_get_net(vport->dp)), 0,
+						ovs_dp_vport_multicast_group.id,
+						PTR_ERR(notify));
 				break;
 			}
 
-			genl_notify(reply, dev_net(dev), 0,
-				    dp_vport_multicast_group.id, NULL,
-				    GFP_KERNEL);
+			genlmsg_multicast_netns(ovs_dp_get_net(vport->dp), notify, 0,
+						ovs_dp_vport_multicast_group.id,
+						GFP_KERNEL);
 		}
 		break;
 
 	case NETDEV_CHANGENAME:
 		if (vport->port_no != OVSP_LOCAL) {
-			dp_sysfs_del_if(vport);
-			dp_sysfs_add_if(vport);
+			ovs_dp_sysfs_del_if(vport);
+			ovs_dp_sysfs_add_if(vport);
 		}
 		break;
 	}
+
 	return NOTIFY_DONE;
 }
 
-struct notifier_block dp_device_notifier = {
+struct notifier_block ovs_dp_device_notifier = {
 	.notifier_call = dp_device_event
 };