From: Bhanuprakash Bodireddy <bhanuprakash.bodireddy@intel.com>
Date: Fri, 22 Sep 2017 09:04:32 +0000 (-0700)
Subject: conntrack: Use DP_PACKET_BATCH_FOR_EACH macro.
X-Git-Tag: v2.12.3~2647^2~8
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=43495c45772c6d58a94dfe0723dfaf35c3580c4e;p=mirror_ovs.git

conntrack: Use DP_PACKET_BATCH_FOR_EACH macro.

Use DP_PACKET_BATCH_FOR_EACH macro in conntrack_execute().

Signed-off-by: Bhanuprakash Bodireddy <bhanuprakash.bodireddy@intel.com>
Signed-off-by: Darrell Ball <dlu998@gmail.com>
---

diff --git a/lib/conntrack.c b/lib/conntrack.c
index 419cb1def..019092e11 100644
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -1141,17 +1141,16 @@ conntrack_execute(struct conntrack *ct, struct dp_packet_batch *pkt_batch,
                   long long now)
 {
 
-    struct dp_packet **pkts = pkt_batch->packets;
-    size_t cnt = pkt_batch->count;
+    struct dp_packet *packet;
     struct conn_lookup_ctx ctx;
 
-    for (size_t i = 0; i < cnt; i++) {
-        if (!conn_key_extract(ct, pkts[i], dl_type, &ctx, zone)) {
-            pkts[i]->md.ct_state = CS_INVALID;
-            write_ct_md(pkts[i], zone, NULL, NULL, NULL);
+    DP_PACKET_BATCH_FOR_EACH (packet, pkt_batch) {
+        if (!conn_key_extract(ct, packet, dl_type, &ctx, zone)) {
+            packet->md.ct_state = CS_INVALID;
+            write_ct_md(packet, zone, NULL, NULL, NULL);
             continue;
         }
-        process_one(ct, pkts[i], &ctx, zone, force, commit,
+        process_one(ct, packet, &ctx, zone, force, commit,
                     now, setmark, setlabel, nat_action_info, helper);
     }