summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/ic/re.c12
-rw-r--r--sys/dev/ic/xl.c6
-rw-r--r--sys/dev/pci/if_age.c8
-rw-r--r--sys/dev/pci/if_alc.c4
-rw-r--r--sys/dev/pci/if_ale.c4
-rw-r--r--sys/dev/pci/if_bge.c6
-rw-r--r--sys/dev/pci/if_bnx.c4
-rw-r--r--sys/dev/pci/if_em.c6
-rw-r--r--sys/dev/pci/if_ix.c6
-rw-r--r--sys/dev/pci/if_ixgb.c6
-rw-r--r--sys/dev/pci/if_jme.c6
-rw-r--r--sys/dev/pci/if_nfe.c4
-rw-r--r--sys/dev/pci/if_stge.c6
-rw-r--r--sys/dev/pci/if_txp.c6
-rw-r--r--sys/dev/pci/if_vge.c6
-rw-r--r--sys/dev/pci/if_vr.c6
-rw-r--r--sys/dev/pci/if_xge.c6
-rw-r--r--sys/net/if_bridge.c6
-rw-r--r--sys/net/if_pflow.c4
-rw-r--r--sys/net/pf.c6
-rw-r--r--sys/net/pipex.c4
-rw-r--r--sys/netinet/ip_output.c14
-rw-r--r--sys/netinet/tcp_output.c4
-rw-r--r--sys/netinet/udp_usrreq.c4
-rw-r--r--sys/sys/mbuf.h6
25 files changed, 75 insertions, 75 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index b170c6efda3..d4ea548b970 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.133 2011/03/13 15:35:20 stsp Exp $ */
+/* $OpenBSD: re.c,v 1.134 2011/04/05 18:01:21 henning Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -1707,18 +1707,18 @@ re_encap(struct rl_softc *sc, struct mbuf *m, int *idx)
*/
if ((m->m_pkthdr.csum_flags &
- (M_IPV4_CSUM_OUT|M_TCPV4_CSUM_OUT|M_UDPV4_CSUM_OUT)) != 0) {
+ (M_IPV4_CSUM_OUT|M_TCP_CSUM_OUT|M_UDP_CSUM_OUT)) != 0) {
if (sc->rl_flags & RL_FLAG_DESCV2) {
vlanctl |= RL_TDESC_CMD_IPCSUMV2;
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
vlanctl |= RL_TDESC_CMD_TCPCSUMV2;
- if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
vlanctl |= RL_TDESC_CMD_UDPCSUMV2;
} else {
csum_flags |= RL_TDESC_CMD_IPCSUM;
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
csum_flags |= RL_TDESC_CMD_TCPCSUM;
- if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
csum_flags |= RL_TDESC_CMD_UDPCSUM;
}
}
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 3d5eacce92e..b4408d71825 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xl.c,v 1.99 2010/09/22 08:49:14 claudio Exp $ */
+/* $OpenBSD: xl.c,v 1.100 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -1661,9 +1661,9 @@ reload:
if (m_head->m_pkthdr.csum_flags) {
if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
status |= XL_TXSTAT_IPCKSUM;
- if (m_head->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
status |= XL_TXSTAT_TCPCKSUM;
- if (m_head->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
status |= XL_TXSTAT_UDPCKSUM;
}
#endif
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 69bc9e2ad2a..0fe9b7dc867 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_age.c,v 1.12 2010/08/27 17:08:00 jsg Exp $ */
+/* $OpenBSD: if_age.c,v 1.13 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -132,7 +132,7 @@ struct cfdriver age_cd = {
int agedebug = 0;
#define DPRINTF(x) do { if (agedebug) printf x; } while (0)
-#define AGE_CSUM_FEATURES (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)
+#define AGE_CSUM_FEATURES (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)
int
age_match(struct device *dev, void *match, void *aux)
@@ -1195,9 +1195,9 @@ age_encap(struct age_softc *sc, struct mbuf **m_head)
/* Configure Tx IP/TCP/UDP checksum offload. */
if ((m->m_pkthdr.csum_flags & AGE_CSUM_FEATURES) != 0) {
cflags |= AGE_TD_CSUM;
- if ((m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) != 0)
+ if ((m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) != 0)
cflags |= AGE_TD_TCPCSUM;
- if ((m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) != 0)
+ if ((m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) != 0)
cflags |= AGE_TD_UDPCSUM;
/* Set checksum start offset. */
cflags |= (poff << AGE_TD_CSUM_PLOADOFFSET_SHIFT);
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index 628a1de0b5b..6b3576eb9d7 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_alc.c,v 1.10 2011/02/18 17:20:15 mikeb Exp $ */
+/* $OpenBSD: if_alc.c,v 1.11 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -140,7 +140,7 @@ struct cfdriver alc_cd = {
int alcdebug = 0;
#define DPRINTF(x) do { if (alcdebug) printf x; } while (0)
-#define ALC_CSUM_FEATURES (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)
+#define ALC_CSUM_FEATURES (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)
int
alc_miibus_readreg(struct device *dev, int phy, int reg)
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index db2218336d6..a0123a89615 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ale.c,v 1.16 2010/08/31 17:13:44 deraadt Exp $ */
+/* $OpenBSD: if_ale.c,v 1.17 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -135,7 +135,7 @@ struct cfdriver ale_cd = {
int aledebug = 0;
#define DPRINTF(x) do { if (aledebug) printf x; } while (0)
-#define ALE_CSUM_FEATURES (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)
+#define ALE_CSUM_FEATURES (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)
int
ale_miibus_readreg(struct device *dev, int phy, int reg)
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index bd44e913e7b..711c70e39e0 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bge.c,v 1.305 2011/02/22 18:00:44 robert Exp $ */
+/* $OpenBSD: if_bge.c,v 1.306 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -3038,8 +3038,8 @@ bge_encap(struct bge_softc *sc, struct mbuf *m_head, u_int32_t *txidx)
if (m_head->m_pkthdr.csum_flags) {
if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
csum_flags |= BGE_TXBDFLAG_IP_CSUM;
- if (m_head->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT |
- M_UDPV4_CSUM_OUT)) {
+ if (m_head->m_pkthdr.csum_flags & (M_TCP_CSUM_OUT |
+ M_UDP_CSUM_OUT)) {
csum_flags |= BGE_TXBDFLAG_TCP_UDP_CSUM;
if (m_head->m_pkthdr.len < ETHER_MIN_NOPAD &&
bge_cksum_pad(m_head) != 0)
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index 03c57877f96..5388e3fffee 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bnx.c,v 1.91 2011/04/03 15:36:02 jasper Exp $ */
+/* $OpenBSD: if_bnx.c,v 1.92 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2006 Broadcom Corporation
@@ -4833,7 +4833,7 @@ bnx_tx_encap(struct bnx_softc *sc, struct mbuf *m)
if (m->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
flags |= TX_BD_FLAGS_IP_CKSUM;
if (m->m_pkthdr.csum_flags &
- (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT))
+ (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT))
flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;
}
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 26ef0703739..db15c098ebe 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_em.c,v 1.251 2011/04/03 15:36:02 jasper Exp $ */
+/* $OpenBSD: if_em.c,v 1.252 2011/04/05 18:01:21 henning Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -2236,14 +2236,14 @@ em_transmit_checksum_setup(struct em_softc *sc, struct mbuf *mp,
int curr_txd;
if (mp->m_pkthdr.csum_flags) {
- if (mp->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) {
+ if (mp->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) {
*txd_upper = E1000_TXD_POPTS_TXSM << 8;
*txd_lower = E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
if (sc->active_checksum_context == OFFLOAD_TCP_IP)
return;
else
sc->active_checksum_context = OFFLOAD_TCP_IP;
- } else if (mp->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) {
+ } else if (mp->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) {
*txd_upper = E1000_TXD_POPTS_TXSM << 8;
*txd_lower = E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
if (sc->active_checksum_context == OFFLOAD_UDP_IP)
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 14222811d40..7736df5cfb2 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ix.c,v 1.47 2011/04/03 15:36:02 jasper Exp $ */
+/* $OpenBSD: if_ix.c,v 1.48 2011/04/05 18:01:21 henning Exp $ */
/******************************************************************************
@@ -2046,11 +2046,11 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp)
switch (ipproto) {
case IPPROTO_TCP:
- if (mp->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (mp->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
break;
case IPPROTO_UDP:
- if (mp->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (mp->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_UDP;
break;
}
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index 96a2a0b2c8a..827e9da78f3 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_ixgb.c,v 1.58 2011/04/03 15:36:02 jasper Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.59 2011/04/05 18:01:21 henning Exp $ */
#include <dev/pci/if_ixgb.h>
@@ -1296,14 +1296,14 @@ ixgb_transmit_checksum_setup(struct ixgb_softc *sc,
if (mp->m_pkthdr.csum_flags) {
- if (mp->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) {
+ if (mp->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) {
*txd_popts = IXGB_TX_DESC_POPTS_TXSM;
if (sc->active_checksum_context == OFFLOAD_TCP_IP)
return;
else
sc->active_checksum_context = OFFLOAD_TCP_IP;
- } else if (mp->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) {
+ } else if (mp->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) {
*txd_popts = IXGB_TX_DESC_POPTS_TXSM;
if (sc->active_checksum_context == OFFLOAD_UDP_IP)
return;
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 4a855fddd68..323f8e09005 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_jme.c,v 1.24 2010/08/27 17:08:00 jsg Exp $ */
+/* $OpenBSD: if_jme.c,v 1.25 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -1109,9 +1109,9 @@ jme_encap(struct jme_softc *sc, struct mbuf **m_head)
/* Configure checksum offload. */
if (m->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
cflags |= JME_TD_IPCSUM;
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
cflags |= JME_TD_TCPCSUM;
- if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
cflags |= JME_TD_UDPCSUM;
#if NVLAN > 0
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 515ee66e990..644b6b15a2b 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nfe.c,v 1.97 2011/01/10 16:18:03 kettenis Exp $ */
+/* $OpenBSD: if_nfe.c,v 1.98 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -950,7 +950,7 @@ nfe_encap(struct nfe_softc *sc, struct mbuf *m0)
#endif
if (m0->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
flags |= NFE_TX_IP_CSUM;
- if (m0->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT))
+ if (m0->m_pkthdr.csum_flags & (M_TCP_CSUM_OUT | M_UDP_CSUM_OUT))
flags |= NFE_TX_TCP_UDP_CSUM;
for (i = 0; i < map->dm_nsegs; i++) {
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 6bac4973fc8..601ace58561 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_stge.c,v 1.52 2009/12/07 15:31:07 sthen Exp $ */
+/* $OpenBSD: if_stge.c,v 1.53 2011/04/05 18:01:21 henning Exp $ */
/* $NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $ */
/*-
@@ -574,9 +574,9 @@ stge_start(struct ifnet *ifp)
if (m0->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
csum_flags |= TFD_IPChecksumEnable;
- if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m0->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
csum_flags |= TFD_TCPChecksumEnable;
- else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ else if (m0->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
csum_flags |= TFD_UDPChecksumEnable;
#endif
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 84277de5eb4..579dd5ddd2b 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txp.c,v 1.103 2011/04/03 15:36:03 jasper Exp $ */
+/* $OpenBSD: if_txp.c,v 1.104 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 2001
@@ -1378,11 +1378,11 @@ txp_start(struct ifnet *ifp)
if (m->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
txd->tx_pflags |= TX_PFLAGS_IPCKSUM;
#ifdef TRY_TX_TCP_CSUM
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
txd->tx_pflags |= TX_PFLAGS_TCPCKSUM;
#endif
#ifdef TRY_TX_UDP_CSUM
- if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
txd->tx_pflags |= TX_PFLAGS_UDPCKSUM;
#endif
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 953a811de9f..8d4d875f734 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vge.c,v 1.49 2011/04/03 15:36:03 jasper Exp $ */
+/* $OpenBSD: if_vge.c,v 1.50 2011/04/05 18:01:21 henning Exp $ */
/* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */
/*
* Copyright (c) 2004
@@ -1346,9 +1346,9 @@ vge_encap(struct vge_softc *sc, struct mbuf *m_head, int idx)
if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
vge_flags |= VGE_TDCTL_IPCSUM;
- if (m_head->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
vge_flags |= VGE_TDCTL_TCPCSUM;
- if (m_head->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
vge_flags |= VGE_TDCTL_UDPCSUM;
txmap = sc->vge_ldata.vge_tx_dmamap[idx];
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 7703a2a65cb..2ee8f804323 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vr.c,v 1.108 2011/03/13 15:38:50 stsp Exp $ */
+/* $OpenBSD: if_vr.c,v 1.109 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1149,9 +1149,9 @@ vr_encap(struct vr_softc *sc, struct vr_chain *c, struct mbuf *m_head)
if (sc->vr_quirks & VR_Q_CSUM) {
if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
vr_flags |= VR_TXCTL_IPCSUM;
- if (m_head->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
vr_flags |= VR_TXCTL_TCPCSUM;
- if (m_head->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
vr_flags |= VR_TXCTL_UDPCSUM;
}
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 369528cf2eb..a6df2cbe659 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xge.c,v 1.53 2011/04/03 15:36:03 jasper Exp $ */
+/* $OpenBSD: if_xge.c,v 1.54 2011/04/05 18:01:21 henning Exp $ */
/* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */
/*
@@ -1138,9 +1138,9 @@ xge_start(struct ifnet *ifp)
if (m->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
txd->txd_control2 |= TXD_CTL2_CIPv4;
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
txd->txd_control2 |= TXD_CTL2_CTCP;
- if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
txd->txd_control2 |= TXD_CTL2_CUDP;
txd[ntxd].txd_control1 |= TXD_CTL1_GCL;
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index e94f7402c3f..764568b0972 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.189 2011/04/04 13:55:54 henning Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.190 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -1063,8 +1063,8 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
#endif /* IPSEC */
/* Catch packets that need TCP/UDP hardware checksumming */
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT ||
- m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) {
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT ||
+ m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) {
m_freem(m);
splx(s);
return (0);
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index f2b6a3d5bc5..2b506ad0a97 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflow.c,v 1.14 2010/07/02 02:40:16 blambert Exp $ */
+/* $OpenBSD: if_pflow.c,v 1.15 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 2008 Henning Brauer <henning@openbsd.org>
@@ -559,7 +559,7 @@ pflow_sendout_mbuf(struct pflow_softc *sc, struct mbuf *m)
* Compute the pseudo-header checksum; defer further checksumming
* until ip_output() or hardware (if it exists).
*/
- m->m_pkthdr.csum_flags |= M_UDPV4_CSUM_OUT;
+ m->m_pkthdr.csum_flags |= M_UDP_CSUM_OUT;
ui->ui_sum = in_cksum_phdr(ui->ui_src.s_addr,
ui->ui_dst.s_addr, htons(len + sizeof(struct udphdr) +
IPPROTO_UDP));
diff --git a/sys/net/pf.c b/sys/net/pf.c
index f7b0e6404b2..7906d050766 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.735 2011/04/05 15:51:41 sthen Exp $ */
+/* $OpenBSD: pf.c,v 1.736 2011/04/05 18:01:21 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -5162,9 +5162,9 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
} else
ip->ip_sum = in_cksum(m0, ip->ip_hl << 2);
/* Update relevant hardware checksum stats for TCP/UDP */
- if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m0->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
tcpstat.tcps_outhwcsum++;
- else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ else if (m0->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
udpstat.udps_outhwcsum++;
error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL);
goto done;
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 6ab058ebe5d..e0fbfbff24e 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pipex.c,v 1.16 2011/03/14 06:53:33 yasuoka Exp $ */
+/* $OpenBSD: pipex.c,v 1.17 2011/04/05 18:01:21 henning Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -1946,7 +1946,7 @@ pipex_l2tp_output(struct mbuf *m0, struct pipex_session *session)
udp->uh_sum = in_cksum_phdr(ip->ip_src.s_addr,
ip->ip_dst.s_addr, htons(plen + IPPROTO_UDP));
- m0->m_pkthdr.csum_flags |= M_UDPV4_CSUM_OUT;
+ m0->m_pkthdr.csum_flags |= M_UDP_CSUM_OUT;
if (ip_output(m0, NULL, NULL, 0, NULL, NULL) != 0) {
PIPEX_DBG((session, LOG_DEBUG, "ip_output failed."));
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 2e28b25c384..a21c70b8281 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.216 2011/04/04 17:44:43 henning Exp $ */
+/* $OpenBSD: ip_output.c,v 1.217 2011/04/05 18:01:21 henning Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -744,9 +744,9 @@ sendit:
} else
ip->ip_sum = in_cksum(m, hlen);
/* Update relevant hardware checksum stats for TCP/UDP */
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT)
tcpstat.tcps_outhwcsum++;
- else if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
+ else if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT)
udpstat.udps_outhwcsum++;
error = (*ifp->if_output)(ifp, m, sintosa(dst), ro->ro_rt);
goto done;
@@ -2127,17 +2127,17 @@ in_delayed_cksum(struct mbuf *m)
void
in_proto_cksum_out(struct mbuf *m, struct ifnet *ifp)
{
- if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) {
+ if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) {
if (!ifp || !(ifp->if_capabilities & IFCAP_CSUM_TCPv4) ||
ifp->if_bridge != NULL) {
in_delayed_cksum(m);
- m->m_pkthdr.csum_flags &= ~M_TCPV4_CSUM_OUT; /* Clear */
+ m->m_pkthdr.csum_flags &= ~M_TCP_CSUM_OUT; /* Clear */
}
- } else if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) {
+ } else if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) {
if (!ifp || !(ifp->if_capabilities & IFCAP_CSUM_UDPv4) ||
ifp->if_bridge != NULL) {
in_delayed_cksum(m);
- m->m_pkthdr.csum_flags &= ~M_UDPV4_CSUM_OUT; /* Clear */
+ m->m_pkthdr.csum_flags &= ~M_UDP_CSUM_OUT; /* Clear */
}
}
}
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 868b14c65e1..a215aa70cbf 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_output.c,v 1.93 2011/01/07 17:50:42 bluhm Exp $ */
+/* $OpenBSD: tcp_output.c,v 1.94 2011/04/05 18:01:21 henning Exp $ */
/* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */
/*
@@ -955,7 +955,7 @@ send:
#ifdef INET
case AF_INET:
/* Defer checksumming until later (ip_output() or hardware) */
- m->m_pkthdr.csum_flags |= M_TCPV4_CSUM_OUT;
+ m->m_pkthdr.csum_flags |= M_TCP_CSUM_OUT;
if (len + optlen)
th->th_sum = in_cksum_addword(th->th_sum,
htons((u_int16_t)(len + optlen)));
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 6db0e712d09..08a7d13317b 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_usrreq.c,v 1.139 2011/04/03 16:09:09 blambert Exp $ */
+/* $OpenBSD: udp_usrreq.c,v 1.140 2011/04/05 18:01:21 henning Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@@ -1017,7 +1017,7 @@ udp_output(struct mbuf *m, ...)
* until ip_output() or hardware (if it exists).
*/
if (udpcksum) {
- m->m_pkthdr.csum_flags |= M_UDPV4_CSUM_OUT;
+ m->m_pkthdr.csum_flags |= M_UDP_CSUM_OUT;
ui->ui_sum = in_cksum_phdr(ui->ui_src.s_addr,
ui->ui_dst.s_addr, htons((u_int16_t)len +
sizeof (struct udphdr) + IPPROTO_UDP));
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 0d2af45f4f7..696d61aada6 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbuf.h,v 1.147 2011/04/05 11:48:28 blambert Exp $ */
+/* $OpenBSD: mbuf.h,v 1.148 2011/04/05 18:01:21 henning Exp $ */
/* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */
/*
@@ -176,8 +176,8 @@ struct mbuf {
/* Checksumming flags */
#define M_IPV4_CSUM_OUT 0x0001 /* IPv4 checksum needed */
-#define M_TCPV4_CSUM_OUT 0x0002 /* TCP checksum needed */
-#define M_UDPV4_CSUM_OUT 0x0004 /* UDP checksum needed */
+#define M_TCP_CSUM_OUT 0x0002 /* TCP checksum needed */
+#define M_UDP_CSUM_OUT 0x0004 /* UDP checksum needed */
#define M_IPV4_CSUM_IN_OK 0x0008 /* IPv4 checksum verified */
#define M_IPV4_CSUM_IN_BAD 0x0010 /* IPv4 checksum bad */
#define M_TCP_CSUM_IN_OK 0x0020 /* TCP/IPv4 checksum verified */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 04:02:37 +0000