mirror of
https://github.com/xemu-project/xemu.git
synced 2025-02-09 21:53:16 +00:00
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQEcBAABAgAGBQJdt6UAAAoJEO8Ells5jWIRdaAH/3+dufJuFijZY44VYbob92ud lZR1dYah1fBL1bq0F2siFUb+/wgF1IXHJl9tuUJe8Kp0+hnsXji2s4Iuq5lNQoJj wwMGziL1TPkhxwgy4jObIC+/bqZVrzAO4Cd+PARrSGAAbAqjxLPizOaf72/t4kdn C2n87ZlR5k0EOPmUY6Y2DtHtrJ20usSS6EThGhdW7iPSzfQSGiOdRzfZrSiEV2XT cuKbSzQxk7pbPcz4jIgLzaoA7FIXwm99dBosUkjPszNNFbO4+OPDNdUBanYuqmn/ 0ZPe/9YZpEMV64ps/Ab7lx7YB04wZ+A9Etln2JULhBWXg/oyri9gsqgOc6bfCXg= =uE5S -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Tue 29 Oct 2019 02:33:36 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: COLO-compare: Fix incorrect `if` logic virtio-net: prevent offloads reset on migration virtio: new post_load hook net: add tulip (dec21143) driver Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
1cfe28cdca
@ -1666,6 +1666,12 @@ M: Stefan Weil <sw@weilnetz.de>
|
||||
S: Maintained
|
||||
F: hw/net/eepro100.c
|
||||
|
||||
tulip
|
||||
M: Sven Schnelle <svens@stackframe.org>
|
||||
S: Maintained
|
||||
F: hw/net/tulip.c
|
||||
F: hw/net/tulip.h
|
||||
|
||||
Generic Loader
|
||||
M: Alistair Francis <alistair@alistair23.me>
|
||||
S: Maintained
|
||||
|
||||
@ -24,6 +24,11 @@ config PCNET_PCI
|
||||
config PCNET_COMMON
|
||||
bool
|
||||
|
||||
config TULIP
|
||||
bool
|
||||
default y if PCI_DEVICES
|
||||
depends on PCI
|
||||
|
||||
config E1000_PCI
|
||||
bool
|
||||
default y if PCI_DEVICES
|
||||
|
||||
@ -13,6 +13,7 @@ common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += e1000e.o e1000e_core.o e1000x_common.
|
||||
common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
|
||||
common-obj-$(CONFIG_VMXNET3_PCI) += net_tx_pkt.o net_rx_pkt.o
|
||||
common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o
|
||||
common-obj-$(CONFIG_TULIP) += tulip.o
|
||||
|
||||
common-obj-$(CONFIG_SMC91C111) += smc91c111.o
|
||||
common-obj-$(CONFIG_LAN9118) += lan9118.o
|
||||
|
||||
@ -367,3 +367,17 @@ virtio_net_announce_notify(void) ""
|
||||
virtio_net_announce_timer(int round) "%d"
|
||||
virtio_net_handle_announce(int round) "%d"
|
||||
virtio_net_post_load_device(void)
|
||||
|
||||
# tulip.c
|
||||
tulip_reg_write(uint64_t addr, const char *name, int size, uint64_t val) "addr 0x%02"PRIx64" (%s) size %d value 0x%08"PRIx64
|
||||
tulip_reg_read(uint64_t addr, const char *name, int size, uint64_t val) "addr 0x%02"PRIx64" (%s) size %d value 0x%08"PRIx64
|
||||
tulip_receive(const uint8_t *buf, size_t len) "buf %p size %zu"
|
||||
tulip_descriptor(const char *prefix, uint32_t addr, uint32_t status, uint32_t control, uint32_t len1, uint32_t len2, uint32_t buf1, uint32_t buf2) "%s 0x%08x: status 0x%08x control 0x%03x len1 %4d len2 %4d buf1 0x%08x buf2 0x%08x"
|
||||
tulip_rx_state(const char *state) "RX %s"
|
||||
tulip_tx_state(const char *state) "TX %s"
|
||||
tulip_irq(uint32_t mask, uint32_t en, const char *state) "mask 0x%08x ie 0x%08x %s"
|
||||
tulip_mii_write(int phy, int reg, uint16_t data) "phy 0x%x reg 0x%x data 0x%04x"
|
||||
tulip_mii_read(int phy, int reg, uint16_t data) "phy 0x%x, reg 0x%x data 0x%04x"
|
||||
tulip_reset(void) ""
|
||||
tulip_setup_frame(void) ""
|
||||
tulip_setup_filter(int n, uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint8_t e, uint8_t f) "%d: %02x:%02x:%02x:%02x:%02x:%02x"
|
||||
|
||||
1029
hw/net/tulip.c
Normal file
1029
hw/net/tulip.c
Normal file
File diff suppressed because it is too large
Load Diff
267
hw/net/tulip.h
Normal file
267
hw/net/tulip.h
Normal file
@ -0,0 +1,267 @@
|
||||
#ifndef HW_TULIP_H
|
||||
#define HW_TULIP_H
|
||||
|
||||
#include "qemu/units.h"
|
||||
#include "net/net.h"
|
||||
|
||||
#define TYPE_TULIP "tulip"
|
||||
#define TULIP(obj) OBJECT_CHECK(TULIPState, (obj), TYPE_TULIP)
|
||||
|
||||
#define CSR(_x) ((_x) << 3)
|
||||
|
||||
#define CSR0_SWR BIT(0)
|
||||
#define CSR0_BAR BIT(1)
|
||||
#define CSR0_DSL_SHIFT 2
|
||||
#define CSR0_DSL_MASK 0x1f
|
||||
#define CSR0_BLE BIT(7)
|
||||
#define CSR0_PBL_SHIFT 8
|
||||
#define CSR0_PBL_MASK 0x3f
|
||||
#define CSR0_CAC_SHIFT 14
|
||||
#define CSR0_CAC_MASK 0x3
|
||||
#define CSR0_DAS 0x10000
|
||||
#define CSR0_TAP_SHIFT 17
|
||||
#define CSR0_TAP_MASK 0x7
|
||||
#define CSR0_DBO 0x100000
|
||||
#define CSR1_TPD 0x01
|
||||
#define CSR0_RLE BIT(23)
|
||||
#define CSR0_WIE BIT(24)
|
||||
|
||||
#define CSR2_RPD 0x01
|
||||
|
||||
#define CSR5_TI BIT(0)
|
||||
#define CSR5_TPS BIT(1)
|
||||
#define CSR5_TU BIT(2)
|
||||
#define CSR5_TJT BIT(3)
|
||||
#define CSR5_LNP_ANC BIT(4)
|
||||
#define CSR5_UNF BIT(5)
|
||||
#define CSR5_RI BIT(6)
|
||||
#define CSR5_RU BIT(7)
|
||||
#define CSR5_RPS BIT(8)
|
||||
#define CSR5_RWT BIT(9)
|
||||
#define CSR5_ETI BIT(10)
|
||||
#define CSR5_GTE BIT(11)
|
||||
#define CSR5_LNF BIT(12)
|
||||
#define CSR5_FBE BIT(13)
|
||||
#define CSR5_ERI BIT(14)
|
||||
#define CSR5_AIS BIT(15)
|
||||
#define CSR5_NIS BIT(16)
|
||||
#define CSR5_RS_SHIFT 17
|
||||
#define CSR5_RS_MASK 7
|
||||
#define CSR5_TS_SHIFT 20
|
||||
#define CSR5_TS_MASK 7
|
||||
|
||||
#define CSR5_TS_STOPPED 0
|
||||
#define CSR5_TS_RUNNING_FETCH 1
|
||||
#define CSR5_TS_RUNNING_WAIT_EOT 2
|
||||
#define CSR5_TS_RUNNING_READ_BUF 3
|
||||
#define CSR5_TS_RUNNING_SETUP 5
|
||||
#define CSR5_TS_SUSPENDED 6
|
||||
#define CSR5_TS_RUNNING_CLOSE 7
|
||||
|
||||
#define CSR5_RS_STOPPED 0
|
||||
#define CSR5_RS_RUNNING_FETCH 1
|
||||
#define CSR5_RS_RUNNING_CHECK_EOR 2
|
||||
#define CSR5_RS_RUNNING_WAIT_RECEIVE 3
|
||||
#define CSR5_RS_SUSPENDED 4
|
||||
#define CSR5_RS_RUNNING_CLOSE 5
|
||||
#define CSR5_RS_RUNNING_FLUSH 6
|
||||
#define CSR5_RS_RUNNING_QUEUE 7
|
||||
|
||||
#define CSR5_EB_SHIFT 23
|
||||
#define CSR5_EB_MASK 7
|
||||
|
||||
#define CSR5_GPI BIT(26)
|
||||
#define CSR5_LC BIT(27)
|
||||
|
||||
#define CSR6_HP BIT(0)
|
||||
#define CSR6_SR BIT(1)
|
||||
#define CSR6_HO BIT(2)
|
||||
#define CSR6_PB BIT(3)
|
||||
#define CSR6_IF BIT(4)
|
||||
#define CSR6_SB BIT(5)
|
||||
#define CSR6_PR BIT(6)
|
||||
#define CSR6_PM BIT(7)
|
||||
#define CSR6_FKD BIT(8)
|
||||
#define CSR6_FD BIT(9)
|
||||
|
||||
#define CSR6_OM_SHIFT 10
|
||||
#define CSR6_OM_MASK 3
|
||||
#define CSR6_OM_NORMAL 0
|
||||
#define CSR6_OM_INT_LOOPBACK 1
|
||||
#define CSR6_OM_EXT_LOOPBACK 2
|
||||
|
||||
#define CSR6_FC BIT(12)
|
||||
#define CSR6_ST BIT(13)
|
||||
|
||||
|
||||
#define CSR6_TR_SHIFT 14
|
||||
#define CSR6_TR_MASK 3
|
||||
#define CSR6_TR_72 0
|
||||
#define CSR6_TR_96 1
|
||||
#define CSR6_TR_128 2
|
||||
#define CSR6_TR_160 3
|
||||
|
||||
#define CSR6_CA BIT(17)
|
||||
#define CSR6_RA BIT(30)
|
||||
#define CSR6_SC BIT(31)
|
||||
|
||||
#define CSR7_TIM BIT(0)
|
||||
#define CSR7_TSM BIT(1)
|
||||
#define CSR7_TUM BIT(2)
|
||||
#define CSR7_TJM BIT(3)
|
||||
#define CSR7_LPM BIT(4)
|
||||
#define CSR7_UNM BIT(5)
|
||||
#define CSR7_RIM BIT(6)
|
||||
#define CSR7_RUM BIT(7)
|
||||
#define CSR7_RSM BIT(8)
|
||||
#define CSR7_RWM BIT(9)
|
||||
#define CSR7_TMM BIT(11)
|
||||
#define CSR7_LFM BIT(12)
|
||||
#define CSR7_SEM BIT(13)
|
||||
#define CSR7_ERM BIT(14)
|
||||
#define CSR7_AIM BIT(15)
|
||||
#define CSR7_NIM BIT(16)
|
||||
|
||||
#define CSR8_MISSED_FRAME_OVL BIT(16)
|
||||
#define CSR8_MISSED_FRAME_CNT_MASK 0xffff
|
||||
|
||||
#define CSR9_DATA_MASK 0xff
|
||||
#define CSR9_SR_CS BIT(0)
|
||||
#define CSR9_SR_SK BIT(1)
|
||||
#define CSR9_SR_DI BIT(2)
|
||||
#define CSR9_SR_DO BIT(3)
|
||||
#define CSR9_REG BIT(10)
|
||||
#define CSR9_SR BIT(11)
|
||||
#define CSR9_BR BIT(12)
|
||||
#define CSR9_WR BIT(13)
|
||||
#define CSR9_RD BIT(14)
|
||||
#define CSR9_MOD BIT(15)
|
||||
#define CSR9_MDC BIT(16)
|
||||
#define CSR9_MDO BIT(17)
|
||||
#define CSR9_MII BIT(18)
|
||||
#define CSR9_MDI BIT(19)
|
||||
|
||||
#define CSR11_CON BIT(16)
|
||||
#define CSR11_TIMER_MASK 0xffff
|
||||
|
||||
#define CSR12_MRA BIT(0)
|
||||
#define CSR12_LS100 BIT(1)
|
||||
#define CSR12_LS10 BIT(2)
|
||||
#define CSR12_APS BIT(3)
|
||||
#define CSR12_ARA BIT(8)
|
||||
#define CSR12_TRA BIT(9)
|
||||
#define CSR12_NSN BIT(10)
|
||||
#define CSR12_TRF BIT(11)
|
||||
#define CSR12_ANS_SHIFT 12
|
||||
#define CSR12_ANS_MASK 7
|
||||
#define CSR12_LPN BIT(15)
|
||||
#define CSR12_LPC_SHIFT 16
|
||||
#define CSR12_LPC_MASK 0xffff
|
||||
|
||||
#define CSR13_SRL BIT(0)
|
||||
#define CSR13_CAC BIT(2)
|
||||
#define CSR13_AUI BIT(3)
|
||||
#define CSR13_SDM_SHIFT 4
|
||||
#define CSR13_SDM_MASK 0xfff
|
||||
|
||||
#define CSR14_ECEN BIT(0)
|
||||
#define CSR14_LBK BIT(1)
|
||||
#define CSR14_DREN BIT(2)
|
||||
#define CSR14_LSE BIT(3)
|
||||
#define CSR14_CPEN_SHIFT 4
|
||||
#define CSR14_CPEN_MASK 3
|
||||
#define CSR14_MBO BIT(6)
|
||||
#define CSR14_ANE BIT(7)
|
||||
#define CSR14_RSQ BIT(8)
|
||||
#define CSR14_CSQ BIT(9)
|
||||
#define CSR14_CLD BIT(10)
|
||||
#define CSR14_SQE BIT(11)
|
||||
#define CSR14_LTE BIT(12)
|
||||
#define CSR14_APE BIT(13)
|
||||
#define CSR14_SPP BIT(14)
|
||||
#define CSR14_TAS BIT(15)
|
||||
|
||||
#define CSR15_JBD BIT(0)
|
||||
#define CSR15_HUJ BIT(1)
|
||||
#define CSR15_JCK BIT(2)
|
||||
#define CSR15_ABM BIT(3)
|
||||
#define CSR15_RWD BIT(4)
|
||||
#define CSR15_RWR BIT(5)
|
||||
#define CSR15_LE1 BIT(6)
|
||||
#define CSR15_LV1 BIT(7)
|
||||
#define CSR15_TSCK BIT(8)
|
||||
#define CSR15_FUSQ BIT(9)
|
||||
#define CSR15_FLF BIT(10)
|
||||
#define CSR15_LSD BIT(11)
|
||||
#define CSR15_DPST BIT(12)
|
||||
#define CSR15_FRL BIT(13)
|
||||
#define CSR15_LE2 BIT(14)
|
||||
#define CSR15_LV2 BIT(15)
|
||||
|
||||
#define RDES0_OF BIT(0)
|
||||
#define RDES0_CE BIT(1)
|
||||
#define RDES0_DB BIT(2)
|
||||
#define RDES0_RJ BIT(4)
|
||||
#define RDES0_FT BIT(5)
|
||||
#define RDES0_CS BIT(6)
|
||||
#define RDES0_TL BIT(7)
|
||||
#define RDES0_LS BIT(8)
|
||||
#define RDES0_FS BIT(9)
|
||||
#define RDES0_MF BIT(10)
|
||||
#define RDES0_RF BIT(11)
|
||||
#define RDES0_DT_SHIFT 12
|
||||
#define RDES0_DT_MASK 3
|
||||
#define RDES0_LE BIT(14)
|
||||
#define RDES0_ES BIT(15)
|
||||
#define RDES0_FL_SHIFT 16
|
||||
#define RDES0_FL_MASK 0x3fff
|
||||
#define RDES0_FF BIT(30)
|
||||
#define RDES0_OWN BIT(31)
|
||||
|
||||
#define RDES1_BUF1_SIZE_SHIFT 0
|
||||
#define RDES1_BUF1_SIZE_MASK 0x7ff
|
||||
|
||||
#define RDES1_BUF2_SIZE_SHIFT 11
|
||||
#define RDES1_BUF2_SIZE_MASK 0x7ff
|
||||
#define RDES1_RCH BIT(24)
|
||||
#define RDES1_RER BIT(25)
|
||||
|
||||
#define TDES0_DE BIT(0)
|
||||
#define TDES0_UF BIT(1)
|
||||
#define TDES0_LF BIT(2)
|
||||
#define TDES0_CC_SHIFT 3
|
||||
#define TDES0_CC_MASK 0xf
|
||||
#define TDES0_HF BIT(7)
|
||||
#define TDES0_EC BIT(8)
|
||||
#define TDES0_LC BIT(9)
|
||||
#define TDES0_NC BIT(10)
|
||||
#define TDES0_LO BIT(11)
|
||||
#define TDES0_TO BIT(14)
|
||||
#define TDES0_ES BIT(15)
|
||||
#define TDES0_OWN BIT(31)
|
||||
|
||||
#define TDES1_BUF1_SIZE_SHIFT 0
|
||||
#define TDES1_BUF1_SIZE_MASK 0x7ff
|
||||
|
||||
#define TDES1_BUF2_SIZE_SHIFT 11
|
||||
#define TDES1_BUF2_SIZE_MASK 0x7ff
|
||||
|
||||
#define TDES1_FT0 BIT(22)
|
||||
#define TDES1_DPD BIT(23)
|
||||
#define TDES1_TCH BIT(24)
|
||||
#define TDES1_TER BIT(25)
|
||||
#define TDES1_AC BIT(26)
|
||||
#define TDES1_SET BIT(27)
|
||||
#define TDES1_FT1 BIT(28)
|
||||
#define TDES1_FS BIT(29)
|
||||
#define TDES1_LS BIT(30)
|
||||
#define TDES1_IC BIT(31)
|
||||
|
||||
struct tulip_descriptor {
|
||||
uint32_t status;
|
||||
uint32_t control;
|
||||
uint32_t buf_addr1;
|
||||
uint32_t buf_addr2;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -2333,9 +2333,13 @@ static int virtio_net_post_load_device(void *opaque, int version_id)
|
||||
n->curr_guest_offloads = virtio_net_supported_guest_offloads(n);
|
||||
}
|
||||
|
||||
if (peer_has_vnet_hdr(n)) {
|
||||
virtio_net_apply_guest_offloads(n);
|
||||
}
|
||||
/*
|
||||
* curr_guest_offloads will be later overwritten by the
|
||||
* virtio_set_features_nocheck call done from the virtio_load.
|
||||
* Here we make sure it is preserved and restored accordingly
|
||||
* in the virtio_net_post_load_virtio callback.
|
||||
*/
|
||||
n->saved_guest_offloads = n->curr_guest_offloads;
|
||||
|
||||
virtio_net_set_queues(n);
|
||||
|
||||
@ -2370,6 +2374,22 @@ static int virtio_net_post_load_device(void *opaque, int version_id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int virtio_net_post_load_virtio(VirtIODevice *vdev)
|
||||
{
|
||||
VirtIONet *n = VIRTIO_NET(vdev);
|
||||
/*
|
||||
* The actual needed state is now in saved_guest_offloads,
|
||||
* see virtio_net_post_load_device for detail.
|
||||
* Restore it back and apply the desired offloads.
|
||||
*/
|
||||
n->curr_guest_offloads = n->saved_guest_offloads;
|
||||
if (peer_has_vnet_hdr(n)) {
|
||||
virtio_net_apply_guest_offloads(n);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* tx_waiting field of a VirtIONetQueue */
|
||||
static const VMStateDescription vmstate_virtio_net_queue_tx_waiting = {
|
||||
.name = "virtio-net-queue-tx_waiting",
|
||||
@ -2912,6 +2932,7 @@ static void virtio_net_class_init(ObjectClass *klass, void *data)
|
||||
vdc->guest_notifier_mask = virtio_net_guest_notifier_mask;
|
||||
vdc->guest_notifier_pending = virtio_net_guest_notifier_pending;
|
||||
vdc->legacy_features |= (0x1 << VIRTIO_NET_F_GSO);
|
||||
vdc->post_load = virtio_net_post_load_virtio;
|
||||
vdc->vmsd = &vmstate_virtio_net_device;
|
||||
}
|
||||
|
||||
|
||||
@ -3089,6 +3089,13 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
if (vdc->post_load) {
|
||||
ret = vdc->post_load(vdev);
|
||||
if (ret) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -164,6 +164,7 @@
|
||||
#define PCI_DEVICE_ID_LSI_SAS0079 0x0079
|
||||
|
||||
#define PCI_VENDOR_ID_DEC 0x1011
|
||||
#define PCI_DEVICE_ID_DEC_21143 0x0019
|
||||
#define PCI_DEVICE_ID_DEC_21154 0x0026
|
||||
|
||||
#define PCI_VENDOR_ID_CIRRUS 0x1013
|
||||
|
||||
@ -182,6 +182,8 @@ struct VirtIONet {
|
||||
char *netclient_name;
|
||||
char *netclient_type;
|
||||
uint64_t curr_guest_offloads;
|
||||
/* used on saved state restore phase to preserve the curr_guest_offloads */
|
||||
uint64_t saved_guest_offloads;
|
||||
AnnounceTimer announce_timer;
|
||||
bool needs_vnet_hdr_swap;
|
||||
bool mtu_bypass_backend;
|
||||
|
||||
@ -153,6 +153,12 @@ typedef struct VirtioDeviceClass {
|
||||
*/
|
||||
void (*save)(VirtIODevice *vdev, QEMUFile *f);
|
||||
int (*load)(VirtIODevice *vdev, QEMUFile *f, int version_id);
|
||||
/* Post load hook in vmsd is called early while device is processed, and
|
||||
* when VirtIODevice isn't fully initialized. Devices should use this instead,
|
||||
* unless they specifically want to verify the migration stream as it's
|
||||
* processed, e.g. for bounds checking.
|
||||
*/
|
||||
int (*post_load)(VirtIODevice *vdev);
|
||||
const VMStateDescription *vmsd;
|
||||
} VirtioDeviceClass;
|
||||
|
||||
|
||||
@ -319,7 +319,7 @@ 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,
|
||||
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;
|
||||
@ -329,7 +329,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
|
||||
|
||||
/* one part of secondary packet payload still need to be compared */
|
||||
if (!after(ppkt->seq_end, spkt->seq_end)) {
|
||||
if (colo_compare_packet_payload(ppkt, spkt,
|
||||
if (!colo_compare_packet_payload(ppkt, spkt,
|
||||
ppkt->header_size + ppkt->offset,
|
||||
spkt->header_size + spkt->offset,
|
||||
ppkt->payload_size - ppkt->offset)) {
|
||||
@ -348,7 +348,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
|
||||
/* primary packet is longer than secondary packet, compare
|
||||
* the same part and mark the primary packet offset
|
||||
*/
|
||||
if (colo_compare_packet_payload(ppkt, spkt,
|
||||
if (!colo_compare_packet_payload(ppkt, spkt,
|
||||
ppkt->header_size + ppkt->offset,
|
||||
spkt->header_size + spkt->offset,
|
||||
spkt->payload_size - spkt->offset)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user