Merge "master" into "wdp".

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

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 880c9cd..c362ac5 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -21,7 +21,7 @@
 
 #include "list.h"
 #include "netdev-vport.h"
-#include "openvswitch/datapath-protocol.h"
+#include "openvswitch/xflow.h"
 #include "shash.h"
 #include "socket-util.h"
 #include "vlog.h"
@@ -59,7 +59,7 @@ int
 netdev_vport_set_etheraddr(struct netdev *netdev,
                            const 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),
@@ -67,7 +67,7 @@ netdev_vport_set_etheraddr(struct netdev *netdev,
 
     memcpy(vport_ether.ether_addr, mac, ETH_ADDR_LEN);
 
-    err = netdev_vport_do_ioctl(ODP_VPORT_ETHER_SET, &vport_ether);
+    err = netdev_vport_do_ioctl(XFLOW_VPORT_ETHER_SET, &vport_ether);
     if (err) {
         return err;
     }
@@ -80,13 +80,13 @@ int
 netdev_vport_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 = netdev_vport_do_ioctl(ODP_VPORT_ETHER_GET, &vport_ether);
+    err = netdev_vport_do_ioctl(XFLOW_VPORT_ETHER_GET, &vport_ether);
     if (err) {
         return err;
     }
@@ -98,13 +98,13 @@ netdev_vport_get_etheraddr(const struct netdev *netdev,
 int
 netdev_vport_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 = netdev_vport_do_ioctl(ODP_VPORT_MTU_GET, &vport_mtu);
+    err = netdev_vport_do_ioctl(XFLOW_VPORT_MTU_GET, &vport_mtu);
     if (err) {
         return err;
     }
@@ -124,11 +124,11 @@ int
 netdev_vport_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 = netdev_vport_do_ioctl(ODP_VPORT_STATS_GET, &ovsr);
+    err = netdev_vport_do_ioctl(XFLOW_VPORT_STATS_GET, &ovsr);
     if (err) {
         return err;
     }
@@ -161,7 +161,7 @@ netdev_vport_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
 int
 netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
 {
-    struct odp_vport_stats_req ovsr;
+    struct xflow_vport_stats_req ovsr;
     int err;
 
     ovs_strlcpy(ovsr.devname, netdev_get_name(netdev), sizeof ovsr.devname);
@@ -179,7 +179,7 @@ netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
     ovsr.stats.rx_crc_err = stats->rx_crc_errors;
     ovsr.stats.rx_frame_err = stats->rx_frame_errors;
 
-    err = netdev_vport_do_ioctl(ODP_VPORT_STATS_SET, &ovsr);
+    err = netdev_vport_do_ioctl(XFLOW_VPORT_STATS_SET, &ovsr);
 
     /* If the vport layer doesn't know about the device, that doesn't mean it
      * doesn't exist (after all were able to open it when netdev_open() was