dpif-netdev: Reduce code duplication

Code clean up to reduce code duplication. Signed-off-by: Andy Zhou <[email protected]> Acked-by: Daniele Di Proietto <[email protected]>
atheurer · Jan 28, 2016 · f9fe365 · f9fe365
1 parent d1aa0b9
commit f9fe365
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -3275,13 +3275,11 @@ dp_netdev_queue_batches(struct dp_packet *pkt,
 {
     struct packet_batch *batch = flow->batch;
 
-    if (OVS_LIKELY(batch)) {
-        packet_batch_update(batch, pkt, mf);
-        return;
+    if (OVS_UNLIKELY(!batch)) {
+        batch = &batches[(*n_batches)++];
+        packet_batch_init(batch, flow);
     }
 
-    batch = &batches[(*n_batches)++];
-    packet_batch_init(batch, flow);
     packet_batch_update(batch, pkt, mf);
 }