diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-10-05 11:06:12 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-10-11 10:37:25 -0700 |
| commit | 3ee8a9f0027bbcbc92358048bb6e858eb32fe504 (patch) | |
| tree | 4e8e3298e944b785dcc8b1ff0e591aaf782ce344 /lib/meta-flow.c | |
| parent | 2cd2c2ef3d901c4ef1339e3e8459c64508bee167 (diff) | |
openflow: Delete icmp_type and icmp_code macros.
These macros caused trouble if datapath-protocol.h was included before
openflow.h. Later references to the icmp_type and icmp_code members of
struct ovs_key_icmp caused compiler errors, because the macros caused them
to try to refer to nonexistent tp_src and tp_dst members in those
structures.
Diffstat (limited to 'lib/meta-flow.c')
| -rw-r--r-- | lib/meta-flow.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 71544265..f2f13484 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -591,17 +591,17 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) case MFP_ND: return (is_icmpv6(flow) - && flow->icmp_code == htons(0) - && (flow->icmp_type == htons(ND_NEIGHBOR_SOLICIT) || - flow->icmp_type == htons(ND_NEIGHBOR_ADVERT))); + && flow->tp_dst == htons(0) + && (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) || + flow->tp_src == htons(ND_NEIGHBOR_ADVERT))); case MFP_ND_SOLICIT: return (is_icmpv6(flow) - && flow->icmp_code == htons(0) - && (flow->icmp_type == htons(ND_NEIGHBOR_SOLICIT))); + && flow->tp_dst == htons(0) + && (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT))); case MFP_ND_ADVERT: return (is_icmpv6(flow) - && flow->icmp_code == htons(0) - && (flow->icmp_type == htons(ND_NEIGHBOR_ADVERT))); + && flow->tp_dst == htons(0) + && (flow->tp_src == htons(ND_NEIGHBOR_ADVERT))); } NOT_REACHED(); |