X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-generic.c;h=09b0b7cfa2a0275d7da7b2e0b099fbf85a1da980;hb=0b10e452a96295c4f0a117f5fae4f55bca5f6b58;hp=5bb27c785da9b0d68bdc3922c61adb77f379f179;hpb=fceb2a5bb2063023777fc75c68a2670b5169fa13;p=sliver-openvswitch.git

diff --git a/datapath/vport-generic.c b/datapath/vport-generic.c
index 5bb27c785..09b0b7cfa 100644
--- a/datapath/vport-generic.c
+++ b/datapath/vport-generic.c
@@ -1,39 +1,36 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2011 Nicira, Inc.
  *
- * 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
  */
 
 #include <linux/etherdevice.h>
 
 #include "vport-generic.h"
 
-void vport_gen_rand_ether_addr(u8 *addr)
-{
-	random_ether_addr(addr);
-
-	/* Set the OUI to the Nicira one. */
-	addr[0] = 0x00;
-	addr[1] = 0x23;
-	addr[2] = 0x20;
-
-	/* Set the top bit to indicate random address. */
-	addr[3] |= 0x80;
-}
-
-unsigned vport_gen_get_dev_flags(const struct vport *vport)
+unsigned ovs_vport_gen_get_dev_flags(const struct vport *vport)
 {
 	return IFF_UP | IFF_RUNNING | IFF_LOWER_UP;
 }
 
-int vport_gen_is_running(const struct vport *vport)
+int ovs_vport_gen_is_running(const struct vport *vport)
 {
 	return 1;
 }
 
-unsigned char vport_gen_get_operstate(const struct vport *vport)
+unsigned char ovs_vport_gen_get_operstate(const struct vport *vport)
 {
 	return IF_OPER_UP;
 }