X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fclassifier.c;fp=lib%2Fclassifier.c;h=730cae84205c3361d25c70daa868165e9e65f5b2;hb=93a410fd9f6ef338d7208bc5768b60287aa82d01;hp=faaeaf5b6cec552dc55bcfffb4a5bbdc36e32cc6;hpb=0f2bbc23998430276a2f530ede1de40e45098441;p=sliver-openvswitch.git diff --git a/lib/classifier.c b/lib/classifier.c index faaeaf5b6..730cae842 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -630,11 +630,11 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ds_put_char(s, ','); } if (!(w & FWW_ARP_SHA)) { - ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", + ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", ETH_ADDR_ARGS(f->arp_sha)); } if (!(w & FWW_ARP_THA)) { - ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", + ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", ETH_ADDR_ARGS(f->arp_tha)); } } else { @@ -1172,7 +1172,7 @@ flow_equal_except(const struct flow *a, const struct flow *b, &wildcards->ipv6_src_mask) && ipv6_equal_except(&a->ipv6_dst, &b->ipv6_dst, &wildcards->ipv6_dst_mask) - && (wc & FWW_ND_TARGET + && (wc & FWW_ND_TARGET || ipv6_addr_equals(&a->nd_target, &b->nd_target))); }