odp-util: Improve formatting of ND export to odp.
authorJoe Stringer <joestringer@nicira.com>
Thu, 15 May 2014 03:56:30 +0000 (15:56 +1200)
committerJoe Stringer <joestringer@nicira.com>
Mon, 19 May 2014 04:15:20 +0000 (16:15 +1200)
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
lib/odp-util.c

index 34ac5cd..6cff2f1 100644 (file)
@@ -2643,11 +2643,11 @@ odp_flow_key_from_flow__(struct ofpbuf *buf, const struct flow *flow,
             icmpv6_key->icmpv6_type = ntohs(data->tp_src);
             icmpv6_key->icmpv6_code = ntohs(data->tp_dst);
 
-            if (flow->tp_dst == htons(0) &&
-                (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) ||
-                 flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) &&
-                (!export_mask || (data->tp_src == htons(0xffff) &&
-                              data->tp_dst == htons(0xffff)))) {
+            if (flow->tp_dst == htons(0)
+                && (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)
+                    || flow->tp_src == htons(ND_NEIGHBOR_ADVERT))
+                && (!export_mask || (data->tp_src == htons(0xffff)
+                                     && data->tp_dst == htons(0xffff)))) {
 
                 struct ovs_key_nd *nd_key;