summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2019-06-07 06:53:15 +0000
committerdlg <dlg@openbsd.org>2019-06-07 06:53:15 +0000
commit2c7b984aa6a5c542dd29ebd763928d9eac1f4be1 (patch)
treed3a578760388c252b5f4aec0523a402018b71bfb
parenthave mcx_process_rx return the number of slots it made free (diff)
downloadwireguard-openbsd-2c7b984aa6a5c542dd29ebd763928d9eac1f4be1.tar.xz
wireguard-openbsd-2c7b984aa6a5c542dd29ebd763928d9eac1f4be1.zip
make struct mcx_cq_entry a bit closer to reality
this puts the timestamp, rx drops, and hash fields in the right place. ok jmatthew@
-rw-r--r--sys/dev/pci/if_mcx.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c
index 8dfe00a2a9c..c1f41ba1210 100644
--- a/sys/dev/pci/if_mcx.c
+++ b/sys/dev/pci/if_mcx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mcx.c,v 1.20 2019/06/07 06:47:41 dlg Exp $ */
+/* $OpenBSD: if_mcx.c,v 1.21 2019/06/07 06:53:15 dlg Exp $ */
/*
* Copyright (c) 2017 David Gwynne <dlg@openbsd.org>
@@ -1239,20 +1239,21 @@ struct mcx_cmd_destroy_cq_out {
} __packed __aligned(4);
struct mcx_cq_entry {
- uint32_t cq_reserved1;
+ uint32_t __reserved__;
uint32_t cq_lro;
uint32_t cq_lro_ack_seq_num;
uint32_t cq_rx_hash;
- uint32_t cq_rx_hash_type;
+ uint8_t cq_rx_hash_type;
+ uint8_t cq_ml_path;
+ uint16_t __reserved__;
uint32_t cq_checksum;
- uint32_t cq_reserved2;
+ uint32_t __reserved__;
uint32_t cq_flags;
uint32_t cq_lro_srqn;
- uint32_t cq_reserved3[2];
+ uint32_t __reserved__[2];
uint32_t cq_byte_cnt;
- uint32_t cq_lro_ts_value;
- uint32_t cq_lro_ts_echo;
- uint32_t cq_flow_tag;
+ uint64_t cq_timestamp;
+ uint32_t cq_rx_drops;
uint16_t cq_wqe_count;
uint8_t cq_signature;
uint8_t cq_opcode_owner;