diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-05 09:33:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-05 09:33:20 +0000 |
| commit | 0984a157c1c053394adbf64ed7de97f1aebe6a2d (patch) | |
| tree | 8c750c38d4bd328a10e3965e7cb39d27cfc6b8b8 /net/colo-compare.c | |
| parent | b6179aaff961627fcb59d7b234297966b81ac726 (diff) | |
| parent | 4b9b70000218640a42c3ea908a12665e5840b6cd (diff) | |
| download | qemu-0984a157c1c053394adbf64ed7de97f1aebe6a2d.zip qemu-0984a157c1c053394adbf64ed7de97f1aebe6a2d.tar.gz qemu-0984a157c1c053394adbf64ed7de97f1aebe6a2d.tar.bz2 | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 05 Mar 2019 07:06:28 GMT
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
tests: Add a test for qemu self announcements
hmp: Add hmp_announce_self
qmp: Add announce-self command
virtio-net: Allow qemu_announce_self to trigger virtio announcements
net: Add a network device specific self-announcement ability
migration: Switch to using announce timer
virtio-net: Switch to using announce timer
migration: Add announce parameters
net: Introduce announce timer
net: netmap: improve netmap_receive_iov()
net: netmap: simplify netmap_receive()
net: netmap: small improvements netmap_send()
net/colo-compare.c: Remove duplicated code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/colo-compare.c')
| -rw-r--r-- | net/colo-compare.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/colo-compare.c b/net/colo-compare.c index 3e515f3..bf10526 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -294,14 +294,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt, 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, - ppkt->payload_size)) { - *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY; - return true; - } - } /* one part of secondary packet payload still need to be compared */ if (!after(ppkt->seq_end, spkt->seq_end)) { |