From: Ethan Jackson Date: Tue, 19 Jul 2011 21:33:29 +0000 (-0700) Subject: nx-match: Whitespace cleanup. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=273971cf1eb8ed9628ebc98ef50c022cb671221c;p=openvswitch nx-match: Whitespace cleanup. --- diff --git a/lib/nx-match.c b/lib/nx-match.c index f66c6556..3712781d 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -345,7 +345,7 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, /* IPv6 Neighbor Discovery. */ case NFI_NXM_NX_ND_TARGET: /* We've already verified that it's an ICMPv6 message. */ - if ((flow->tp_src != htons(ND_NEIGHBOR_SOLICIT)) + if ((flow->tp_src != htons(ND_NEIGHBOR_SOLICIT)) && (flow->tp_src != htons(ND_NEIGHBOR_ADVERT))) { return NXM_BAD_PREREQ; } diff --git a/lib/nx-match.h b/lib/nx-match.h index a76ad1f2..b2260b1f 100644 --- a/lib/nx-match.h +++ b/lib/nx-match.h @@ -97,8 +97,8 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits) * NXM_OF_IPV6_DST_W 4 16 16 36 * NXM_OF_ICMP_TYPE 4 1 -- 5 * NXM_OF_ICMP_CODE 4 1 -- 5 - * NXM_NX_ND_TARGET 4 16 -- 20 - * NXM_NX_ND_SLL 4 6 -- 10 + * NXM_NX_ND_TARGET 4 16 -- 20 + * NXM_NX_ND_SLL 4 6 -- 10 * NXM_NX_REG_W(0) 4 4 4 12 * NXM_NX_REG_W(1) 4 4 4 12 * NXM_NX_REG_W(2) 4 4 4 12