From: Zhang Chen <chen.zhang@intel.com>
Date: Mon, 14 Jan 2019 14:05:10 +0000 (+0800)
Subject: net/colo-compare.c: Remove duplicated code
X-Git-Tag: v4.0.0-rc0~63^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d3aaa5b255ffc55a0561d359159fdaaccf09b31;p=thirdparty%2Fqemu.git

net/colo-compare.c: Remove duplicated code

Fix duplicated code:
https://bugs.launchpad.net/qemu/+bug/1811499

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 3e515f3023a..bf10526f054 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -286,14 +286,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
 {
     *mark = 0;
 
-    if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
-        if (colo_compare_packet_payload(ppkt, spkt,
-                                        ppkt->header_size, spkt->header_size,
-                                        ppkt->payload_size)) {
-            *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY;
-            return true;
-        }
-    }
     if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
         if (colo_compare_packet_payload(ppkt, spkt,
                                         ppkt->header_size, spkt->header_size,