SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-05-07 21:04:28 +00:00
parent a6677bfd36
commit 223def2739
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
29 changed files with 687 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/pci/if_bnxt.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_bnxt.c,v 1.48 2024/04/12 19:27:43 jan Exp $ */
/* $OpenBSD: if_bnxt.c,v 1.49 2024/05/07 18:35:23 jan Exp $ */
/*-
* Broadcom NetXtreme-C/E network driver.
*
@ -1427,7 +1427,7 @@ bnxt_start(struct ifqueue *ifq)
uint32_t paylen;
ether_extract_headers(m, &ext);
if (ext.tcp) {
if (ext.tcp && m->m_pkthdr.ph_mss > 0) {
lflags |= TX_BD_LONG_LFLAGS_LSO;
hdrsize = sizeof(*ext.eh);
if (ext.ip4 || ext.ip6)

4
sys/dev/pci/if_em.c
View file

@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
/* $OpenBSD: if_em.c,v 1.374 2024/02/16 22:30:54 mglocker Exp $ */
/* $OpenBSD: if_em.c,v 1.375 2024/05/07 18:35:23 jan Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@ -2452,7 +2452,7 @@ em_tso_setup(struct em_queue *que, struct mbuf *mp, u_int head,
#endif
ether_extract_headers(mp, &ext);
if (ext.tcp == NULL)
if (ext.tcp == NULL || mp->m_pkthdr.ph_mss == 0)
goto out;
vlan_macip_lens |= (sizeof(*ext.eh) << E1000_ADVTXD_MACLEN_SHIFT);

4
sys/dev/pci/if_igc.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_igc.c,v 1.22 2024/05/06 04:25:52 dlg Exp $ */
/* $OpenBSD: if_igc.c,v 1.23 2024/05/07 18:35:23 jan Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
@ -2093,7 +2093,7 @@ igc_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp, int prod,
}
if (ISSET(mp->m_pkthdr.csum_flags, M_TCP_TSO)) {
if (ext.tcp) {
if (ext.tcp && mp->m_pkthdr.ph_mss > 0) {
uint32_t hdrlen, thlen, paylen, outlen;
thlen = ext.tcphlen;

4
sys/dev/pci/if_ix.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_ix.c,v 1.212 2024/05/01 10:43:42 jan Exp $ */
/* $OpenBSD: if_ix.c,v 1.213 2024/05/07 18:35:23 jan Exp $ */
/******************************************************************************
@ -2535,7 +2535,7 @@ ixgbe_tx_offload(struct mbuf *mp, uint32_t *vlan_macip_lens,
}
if (mp->m_pkthdr.csum_flags & M_TCP_TSO) {
if (ext.tcp) {
if (ext.tcp && mp->m_pkthdr.ph_mss > 0) {
uint32_t hdrlen, thlen, paylen, outlen;
thlen = ext.tcphlen;

4
sys/dev/pci/if_ixl.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_ixl.c,v 1.98 2024/04/12 19:27:43 jan Exp $ */
/* $OpenBSD: if_ixl.c,v 1.99 2024/05/07 18:35:23 jan Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@ -2848,7 +2848,7 @@ ixl_tx_setup_offload(struct mbuf *m0, struct ixl_tx_ring *txr,
}
if (ISSET(m0->m_pkthdr.csum_flags, M_TCP_TSO)) {
if (ext.tcp) {
if (ext.tcp && m0->m_pkthdr.ph_mss > 0) {
struct ixl_tx_desc *ring, *txd;
uint64_t cmd = 0, paylen, outlen;

4
sys/dev/pci/if_vmx.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_vmx.c,v 1.83 2024/04/02 20:59:48 jan Exp $ */
/* $OpenBSD: if_vmx.c,v 1.84 2024/05/07 18:35:23 jan Exp $ */
/*
* Copyright (c) 2013 Tsubai Masanari
@ -1463,7 +1463,7 @@ vmxnet3_tx_offload(struct vmxnet3_txdesc *sop, struct mbuf *m)
* TCP Segmentation Offload
*/
if (ext.tcp == NULL) {
if (ext.tcp == NULL || m->m_pkthdr.ph_mss == 0) {
tcpstat_inc(tcps_outbadtso);
return;
}