X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_sysfs_if.c;h=5b695cfc003a582a3a86359beebbecb45ca3a481;hb=be51a44695b8e2a3efd729524b2c08d32ed572db;hp=42a59692a024915009626688d0cb76b7aa69f1b2;hpb=bb8b34795a1484332ad03d9d5db5cdcf97ed1bc6;p=openvswitch

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index 42a59692..5b695cfc 100644
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -1,15 +1,19 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * 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.
- */
-
-/*
- *	Sysfs attributes of bridge ports for Open vSwitch
+ * 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.
  *
- *  This has been shamelessly copied from the kernel sources.
+ * 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
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -187,12 +191,12 @@ static ssize_t brport_store(struct kobject *kobj,
 		return -EPERM;
 
 	pr_warning("%s: xxx writing port parms not supported yet!\n",
-		   dp_name(p->dp));
+		   ovs_dp_name(p->dp));
 
 	return ret;
 }
 
-struct sysfs_ops brport_sysfs_ops = {
+struct sysfs_ops ovs_brport_sysfs_ops = {
 	.show = brport_show,
 	.store = brport_store,
 };
@@ -202,7 +206,7 @@ struct sysfs_ops brport_sysfs_ops = {
  * Creates a brport subdirectory with bridge attributes.
  * Puts symlink in bridge's brport subdirectory
  */
-int dp_sysfs_add_if(struct vport *p)
+int ovs_dp_sysfs_add_if(struct vport *p)
 {
 	struct datapath *dp = p->dp;
 	struct vport *local_port = rtnl_dereference(dp->ports[OVSP_LOCAL]);
@@ -250,7 +254,7 @@ err:
 	return err;
 }
 
-int dp_sysfs_del_if(struct vport *p)
+int ovs_dp_sysfs_del_if(struct vport *p)
 {
 	if (p->linkname[0]) {
 		sysfs_remove_link(&p->dp->ifobj, p->linkname);