ovs-test: Enhancements to the ovs-test tool

[openvswitch] / ofproto / in-band.c

diff --git a/ofproto/in-band.c b/ofproto/in-band.c
index f9dd21823ae6198a578facd3ee6f8b29289851e8..f73899823e387c948d06223306070e1365a34b95 100644 (file)
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include "classifier.h"
 #include "dhcp.h"
-#include "dpif.h"
 #include "flow.h"
 #include "netdev.h"
 #include "netlink.h"
@@ -267,8 +266,8 @@ in_band_rule_check(const struct flow *flow,
         unsigned int left;
 
         NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) {
-            if (nl_attr_type(a) == ODP_ACTION_ATTR_OUTPUT
-                && nl_attr_get_u32(a) == ODPP_LOCAL) {
+            if (nl_attr_type(a) == OVS_ACTION_ATTR_OUTPUT
+                && nl_attr_get_u32(a) == OVSP_LOCAL) {
                 return true;
             }
         }
@@ -313,7 +312,7 @@ update_rules(struct in_band *ib)
     if (ib->n_remotes && !eth_addr_is_zero(ib->local_mac)) {
         /* (a) Allow DHCP requests sent from the local port. */
         cls_rule_init_catchall(&rule, IBR_FROM_LOCAL_DHCP);
-        cls_rule_set_in_port(&rule, ODPP_LOCAL);
+        cls_rule_set_in_port(&rule, OFPP_LOCAL);
         cls_rule_set_dl_type(&rule, htons(ETH_TYPE_IP));
         cls_rule_set_dl_src(&rule, ib->local_mac);
         cls_rule_set_nw_proto(&rule, IPPROTO_UDP);
@@ -413,7 +412,7 @@ in_band_run(struct in_band *ib)
     struct in_band_rule *rule, *next;
 
     memset(&actions, 0, sizeof actions);
-    actions.oa.output.type = htons(OFPAT_OUTPUT);
+    actions.oa.output.type = htons(OFPAT10_OUTPUT);
     actions.oa.output.len = htons(sizeof actions.oa);
     actions.oa.output.port = htons(OFPP_NORMAL);
     actions.oa.output.max_len = htons(0);
@@ -421,7 +420,7 @@ in_band_run(struct in_band *ib)
         a = &actions.oa;
         na = sizeof actions.oa / sizeof(union ofp_action);
     } else {
-        actions.nxsq.type = htons(OFPAT_VENDOR);
+        actions.nxsq.type = htons(OFPAT10_VENDOR);
         actions.nxsq.len = htons(sizeof actions.nxsq);
         actions.nxsq.vendor = htonl(NX_VENDOR_ID);
         actions.nxsq.subtype = htons(NXAST_SET_QUEUE);