X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fin-band.c;h=6c6832408d540b579b423705c46e2ef6ca8ed0bb;hb=3a48ace3e4799ce25099a8584372abe7a4d6d771;hp=f9dd21823ae6198a578facd3ee6f8b29289851e8;hpb=18812dff32ce650440b9f1eac1bb00afe08c621a;p=openvswitch diff --git a/ofproto/in-band.c b/ofproto/in-band.c index f9dd2182..6c683240 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -267,8 +267,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 +313,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, OVSP_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);