Module Name: src
Committed By: msaitoh
Date: Tue Nov 14 02:31:46 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c
Log Message:
ixgbe(4): Move assignment of TXD. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/pci/ixgbe/ix_txrx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.105 src/sys/dev/pci/ixgbe/ix_txrx.c:1.106
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.105 Thu Nov 2 05:07:57 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Tue Nov 14 02:31:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.105 2023/11/02 05:07:57 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.106 2023/11/14 02:31:46 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.105 2023/11/02 05:07:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.106 2023/11/14 02:31:46 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -854,9 +854,6 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
/* Indicate the whole packet as payload when not doing TSO */
*olinfo_status |= mp->m_pkthdr.len << IXGBE_ADVTXD_PAYLEN_SHIFT;
- /* Now ready a context descriptor */
- TXD = (struct ixgbe_adv_tx_context_desc *)&txr->tx_base[ctxd];
-
/*
* In advanced descriptors the vlan tag must
* be placed into the context descriptor. Hence
@@ -959,6 +956,9 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
no_offloads:
type_tucmd_mlhl |= IXGBE_ADVTXD_DCMD_DEXT | IXGBE_ADVTXD_DTYP_CTXT;
+ /* Now ready a context descriptor */
+ TXD = (struct ixgbe_adv_tx_context_desc *)&txr->tx_base[ctxd];
+
/* Now copy bits into descriptor */
TXD->vlan_macip_lens = htole32(vlan_macip_lens);
TXD->type_tucmd_mlhl = htole32(type_tucmd_mlhl);
