X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=d040d46e7f11c185b948873a4f81645ba32bcbec;hb=b6d1df18552b1c872ceeafb7f6dbfd2717f89cba;hp=07fd222de297d20812f83a7d89407ed6ec66b249;hpb=954fde3f2e68ba41f2f32faf5dbd900ce1b699a5;p=sliver-openvswitch.git

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 07fd222de..d040d46e7 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,13 +1,21 @@
 /*
- * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira Networks.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
-/* Handle changes to managed devices */
-
 #include <linux/netdevice.h>
 #include <net/genetlink.h>
 
@@ -16,53 +24,50 @@
 #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)) {
+			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(INIT_NET_GENL_SOCK, 0,
-						dp_vport_multicast_group.id,
-						PTR_ERR(reply));
+						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(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
 };