Merge "master" into "wdp".

[sliver-openvswitch.git] / lib / netdev-gre.c

diff --git a/lib/netdev-gre.c b/lib/netdev-gre.c
index 4e28fee..39a51f7 100644 (file)
--- a/lib/netdev-gre.c
+++ b/lib/netdev-gre.c
@@ -23,8 +23,8 @@
 #include "list.h"
 #include "netdev-provider.h"
 #include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
 #include "openvswitch/gre.h"
+#include "openvswitch/xflow.h"
 #include "packets.h"
 #include "shash.h"
 #include "socket-util.h"
@@ -170,7 +170,7 @@ netdev_gre_create(const char *name, const char *type OVS_UNUSED,
                   const struct shash *args, struct netdev_dev **netdev_devp)
 {
     int err;
-    struct odp_vport_add ova;
+    struct xflow_vport_add ova;
     struct gre_port_config port_config;
     struct netdev_dev_gre *netdev_dev;
 
@@ -183,16 +183,16 @@ netdev_gre_create(const char *name, const char *type OVS_UNUSED,
         return err;
     }
 
-    err = do_ioctl(ODP_VPORT_ADD, &ova);
+    err = do_ioctl(XFLOW_VPORT_ADD, &ova);
     if (err == EEXIST) {
         VLOG_WARN("%s: destroying existing device", name);
 
-        err = do_ioctl(ODP_VPORT_DEL, ova.devname);
+        err = do_ioctl(XFLOW_VPORT_DEL, ova.devname);
         if (err) {
             return err;
         }
 
-        err = do_ioctl(ODP_VPORT_ADD, &ova);
+        err = do_ioctl(XFLOW_VPORT_ADD, &ova);
     }
 
     if (err) {
@@ -210,7 +210,7 @@ static int
 netdev_gre_reconfigure(struct netdev_dev *netdev_dev_, const struct shash *args)
 {
     const char *name = netdev_dev_get_name(netdev_dev_);
-    struct odp_vport_mod ovm;
+    struct xflow_vport_mod ovm;
     struct gre_port_config port_config;
     int err;
 
@@ -222,7 +222,7 @@ netdev_gre_reconfigure(struct netdev_dev *netdev_dev_, const struct shash *args)
         return err;
     }
 
-    return do_ioctl(ODP_VPORT_MOD, &ovm);
+    return do_ioctl(XFLOW_VPORT_MOD, &ovm);
 }
 
 static void
@@ -230,7 +230,7 @@ netdev_gre_destroy(struct netdev_dev *netdev_dev_)
 {
     struct netdev_dev_gre *netdev_dev = netdev_dev_gre_cast(netdev_dev_);
 
-    do_ioctl(ODP_VPORT_DEL, (char *)netdev_dev_get_name(netdev_dev_));
+    do_ioctl(XFLOW_VPORT_DEL, (char *)netdev_dev_get_name(netdev_dev_));
     free(netdev_dev);
 }
 
@@ -259,7 +259,7 @@ netdev_gre_set_etheraddr(struct netdev *netdev_,
                          const uint8_t mac[ETH_ADDR_LEN])
 {
     struct netdev_gre *netdev = netdev_gre_cast(netdev_);
-    struct odp_vport_ether vport_ether;
+    struct xflow_vport_ether vport_ether;
     int err;
 
     ovs_strlcpy(vport_ether.devname, netdev_get_name(netdev_),
@@ -267,7 +267,7 @@ netdev_gre_set_etheraddr(struct netdev *netdev_,
 
     memcpy(vport_ether.ether_addr, mac, ETH_ADDR_LEN);
 
-    err = ioctl(ioctl_fd, ODP_VPORT_ETHER_SET, &vport_ether);
+    err = ioctl(ioctl_fd, XFLOW_VPORT_ETHER_SET, &vport_ether);
     if (err) {
         return err;
     }
@@ -280,13 +280,13 @@ static int
 netdev_gre_get_etheraddr(const struct netdev *netdev_,
                          uint8_t mac[ETH_ADDR_LEN])
 {
-    struct odp_vport_ether vport_ether;
+    struct xflow_vport_ether vport_ether;
     int err;
 
     ovs_strlcpy(vport_ether.devname, netdev_get_name(netdev_),
                 sizeof vport_ether.devname);
 
-    err = ioctl(ioctl_fd, ODP_VPORT_ETHER_GET, &vport_ether);
+    err = ioctl(ioctl_fd, XFLOW_VPORT_ETHER_GET, &vport_ether);
     if (err) {
         return err;
     }
@@ -298,13 +298,13 @@ netdev_gre_get_etheraddr(const struct netdev *netdev_,
 static int
 netdev_gre_get_mtu(const struct netdev *netdev_, int *mtup)
 {
-    struct odp_vport_mtu vport_mtu;
+    struct xflow_vport_mtu vport_mtu;
     int err;
 
     ovs_strlcpy(vport_mtu.devname, netdev_get_name(netdev_),
                 sizeof vport_mtu.devname);
 
-    err = ioctl(ioctl_fd, ODP_VPORT_MTU_GET, &vport_mtu);
+    err = ioctl(ioctl_fd, XFLOW_VPORT_MTU_GET, &vport_mtu);
     if (err) {
         return err;
     }
@@ -324,11 +324,11 @@ static int
 netdev_gre_get_stats(const struct netdev *netdev_, struct netdev_stats *stats)
 {
     const char *name = netdev_get_name(netdev_);
-    struct odp_vport_stats_req ovsr;
+    struct xflow_vport_stats_req ovsr;
     int err;
 
     ovs_strlcpy(ovsr.devname, name, sizeof ovsr.devname);
-    err = do_ioctl(ODP_VPORT_STATS_GET, &ovsr);
+    err = do_ioctl(XFLOW_VPORT_STATS_GET, &ovsr);
     if (err) {
         return err;
     }