Merge branch 'master' into forward-port

[sliver-openvswitch.git] / datapath / vport-generic.c

diff --git a/datapath/vport-generic.c b/datapath/vport-generic.c
index 8fec185..09b0b7c 100644 (file)
--- a/datapath/vport-generic.c
+++ b/datapath/vport-generic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -20,17 +20,17 @@
 
 #include "vport-generic.h"
 
-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;
 }