summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_bge.c10
-rw-r--r--sys/dev/pci/if_em.c6
-rw-r--r--sys/dev/pci/if_lge.c14
-rw-r--r--sys/dev/pci/if_nge.c22
-rw-r--r--sys/dev/pci/if_san_xilinx.c6
-rw-r--r--sys/dev/pci/if_sk.c6
-rw-r--r--sys/dev/pci/if_stge.c14
-rw-r--r--sys/dev/pci/if_ti.c4
-rw-r--r--sys/dev/pci/if_txp.c10
-rw-r--r--sys/dev/pci/if_vge.c8
10 files changed, 50 insertions, 50 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index e83682db322..9f6395d64e8 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.57 2005/04/04 22:22:07 beck Exp $ */
+/* $OpenBSD: if_bge.c,v 1.58 2005/04/25 17:55:51 brad Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -2303,7 +2303,7 @@ bge_rxeof(sc)
m->m_pkthdr.csum_flags |= CSUM_DATA_VALID;
}
#endif
- m->m_pkthdr.csum = sumflags;
+ m->m_pkthdr.csum_flags = sumflags;
sumflags = 0;
#endif
@@ -2614,10 +2614,10 @@ bge_encap(sc, m_head, txidx)
cur = frag = *txidx;
#ifdef BGE_CHECKSUM
- if (m_head->m_pkthdr.csum) {
- if (m_head->m_pkthdr.csum & M_IPV4_CSUM_OUT)
+ 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 & (M_TCPV4_CSUM_OUT |
+ if (m_head->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT |
M_UDPV4_CSUM_OUT))
csum_flags |= BGE_TXBDFLAG_TCP_UDP_CSUM;
#ifdef fake
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 3ad2342bb48..50afcf63e4d 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
-/* $OpenBSD: if_em.c,v 1.46 2005/04/25 02:08:08 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.47 2005/04/25 17:55:51 brad Exp $ */
#include "bpfilter.h"
#include "vlan.h"
@@ -2638,12 +2638,12 @@ em_receive_checksum(struct em_softc *sc,
if ((rx_desc->status & (E1000_RXD_STAT_IPCS|E1000_RXD_ERR_IPE)) ==
E1000_RXD_STAT_IPCS)
- mp->m_pkthdr.csum |= M_IPV4_CSUM_IN_OK;
+ mp->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
if ((rx_desc->status & (E1000_RXD_STAT_IPCS|E1000_RXD_ERR_IPE|
E1000_RXD_STAT_TCPCS|E1000_RXD_ERR_TCPE)) ==
(E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_IPCS))
- mp->m_pkthdr.csum |= M_TCP_CSUM_IN_OK | M_UDP_CSUM_IN_OK;
+ mp->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_OK | M_UDP_CSUM_IN_OK;
}
void
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 223a1c6ad13..4004ce9f287 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lge.c,v 1.17 2004/09/23 17:45:16 brad Exp $ */
+/* $OpenBSD: if_lge.c,v 1.18 2005/04/25 17:55:51 brad Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1007,21 +1007,21 @@ void lge_rxeof(sc, cnt)
if (rxsts & LGE_RXSTS_ISIP) {
if (rxsts & LGE_RXSTS_IPCSUMERR)
- m->m_pkthdr.csum |= M_IPV4_CSUM_IN_BAD;
+ m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_BAD;
else
- m->m_pkthdr.csum |= M_IPV4_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
}
if (rxsts & LGE_RXSTS_ISTCP) {
if (rxsts & LGE_RXSTS_TCPCSUMERR)
- m->m_pkthdr.csum |= M_TCP_CSUM_IN_BAD;
+ m->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_BAD;
else
- m->m_pkthdr.csum |= M_TCP_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_OK;
}
if (rxsts & LGE_RXSTS_ISUDP) {
if (rxsts & LGE_RXSTS_UDPCSUMERR)
- m->m_pkthdr.csum |= M_UDP_CSUM_IN_BAD;
+ m->m_pkthdr.csum_flags |= M_UDP_CSUM_IN_BAD;
else
- m->m_pkthdr.csum |= M_UDP_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_UDP_CSUM_IN_OK;
}
ether_input_mbuf(ifp, m);
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 501327053a4..2843103d67b 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nge.c,v 1.31 2005/02/17 18:07:36 jfb Exp $ */
+/* $OpenBSD: if_nge.c,v 1.32 2005/04/25 17:55:51 brad Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1346,21 +1346,21 @@ nge_rxeof(sc)
/* Do IP checksum checking. */
if (extsts & NGE_RXEXTSTS_IPPKT) {
if (extsts & NGE_RXEXTSTS_IPCSUMERR)
- m->m_pkthdr.csum |= M_IPV4_CSUM_IN_BAD;
+ m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_BAD;
else
- m->m_pkthdr.csum |= M_IPV4_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
}
if (extsts & NGE_RXEXTSTS_TCPPKT) {
if (extsts & NGE_RXEXTSTS_TCPCSUMERR)
- m->m_pkthdr.csum |= M_TCP_CSUM_IN_BAD;
+ m->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_BAD;
else
- m->m_pkthdr.csum |= M_TCP_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_OK;
}
if (extsts & NGE_RXEXTSTS_UDPPKT) {
if (extsts & NGE_RXEXTSTS_UDPCSUMERR)
- m->m_pkthdr.csum |= M_UDP_CSUM_IN_BAD;
+ m->m_pkthdr.csum_flags |= M_UDP_CSUM_IN_BAD;
else
- m->m_pkthdr.csum |= M_UDP_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_UDP_CSUM_IN_OK;
}
#if NVLAN > 0
@@ -1664,14 +1664,14 @@ nge_encap(sc, m_head, txidx)
* basis.
*/
sc->nge_ldata->nge_tx_list[*txidx].nge_extsts = 0;
- if (m_head->m_pkthdr.csum) {
- if (m_head->m_pkthdr.csum & M_IPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags) {
+ if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT)
sc->nge_ldata->nge_tx_list[*txidx].nge_extsts |=
NGE_TXEXTSTS_IPCSUM;
- if (m_head->m_pkthdr.csum & M_TCPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
sc->nge_ldata->nge_tx_list[*txidx].nge_extsts |=
NGE_TXEXTSTS_TCPCSUM;
- if (m_head->m_pkthdr.csum & M_UDPV4_CSUM_OUT)
+ if (m_head->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
sc->nge_ldata->nge_tx_list[*txidx].nge_extsts |=
NGE_TXEXTSTS_UDPCSUM;
}
diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c
index 89e5aa8d048..b8a3795fb51 100644
--- a/sys/dev/pci/if_san_xilinx.c
+++ b/sys/dev/pci/if_san_xilinx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_san_xilinx.c,v 1.9 2005/04/05 20:11:10 canacar Exp $ */
+/* $OpenBSD: if_san_xilinx.c,v 1.10 2005/04/25 17:55:51 brad Exp $ */
/*-
* Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -2035,7 +2035,7 @@ xilinx_dma_tx_complete(sdla_t *card, xilinx_softc_t *sc)
}
sc->pci_retry = 0;
- sc->tx_dma_mbuf->m_pkthdr.csum = reg;
+ sc->tx_dma_mbuf->m_pkthdr.csum_flags = reg;
IF_ENQUEUE(&sc->wp_tx_complete_list, sc->tx_dma_mbuf);
sc->tx_dma_mbuf = NULL;
@@ -2051,7 +2051,7 @@ static void
xilinx_tx_post_complete(sdla_t *card, xilinx_softc_t *sc, struct mbuf *m)
{
struct ifnet *ifp;
- unsigned long reg = m->m_pkthdr.csum;
+ unsigned long reg = m->m_pkthdr.csum_flags;
WAN_ASSERT1(sc == NULL);
ifp = (struct ifnet *)&sc->common.ifp;
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index a9a8da3ba66..80d15dc640e 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.62 2005/03/18 03:59:34 brad Exp $ */
+/* $OpenBSD: if_sk.c,v 1.63 2005/04/25 17:55:51 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1962,7 +1962,7 @@ sk_rxcsum(struct ifnet *ifp, struct mbuf *m, const u_int16_t csum1, const u_int1
bpf_mtap(ifp->if_bpf, m);
return;
}
- m->m_pkthdr.csum |= M_IPV4_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
if (ip->ip_off & htons(IP_MF | IP_OFFMASK))
return; /* ip frag, we're done for now */
@@ -1981,7 +1981,7 @@ sk_rxcsum(struct ifnet *ifp, struct mbuf *m, const u_int16_t csum1, const u_int1
csum = in_cksum_phdr(ip->ip_src.s_addr, ip->ip_dst.s_addr,
htonl(ntohs(ip->ip_len) - hlen + ip->ip_p) + ipd_csum);
if (csum == 0xffff) {
- m->m_pkthdr.csum |= (ip->ip_p == IPPROTO_TCP) ?
+ m->m_pkthdr.csum_flags |= (ip->ip_p == IPPROTO_TCP) ?
M_TCP_CSUM_IN_OK : M_UDP_CSUM_IN_OK;
}
}
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 2aa62162f31..6fbba2743d5 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.10 2005/01/15 05:24:11 brad Exp $ */
+/* $OpenBSD: if_stge.c,v 1.11 2005/04/25 17:55:51 brad Exp $ */
/* $NetBSD: if_stge.c,v 1.4 2001/07/25 15:44:48 thorpej Exp $ */
/*-
@@ -849,16 +849,16 @@ stge_start(struct ifnet *ifp)
* Initialize checksumming flags in the descriptor.
* Byte-swap constants so the compiler can optimize.
*/
- if (m0->m_pkthdr.csum & M_IPV4_CSUM_OUT) {
+ if (m0->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT) {
STGE_EVCNT_INCR(&sc->sc_ev_txipsum);
csum_flags |= htole64(TFD_IPChecksumEnable);
}
- if (m0->m_pkthdr.csum & M_TCPV4_CSUM_OUT) {
+ if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) {
STGE_EVCNT_INCR(&sc->sc_ev_txtcpsum);
csum_flags |= htole64(TFD_TCPChecksumEnable);
}
- else if (m0->m_pkthdr.csum & M_UDPV4_CSUM_OUT) {
+ else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) {
STGE_EVCNT_INCR(&sc->sc_ev_txudpsum);
csum_flags |= htole64(TFD_UDPChecksumEnable);
}
@@ -1327,15 +1327,15 @@ stge_rxintr(struct stge_softc *sc)
*/
if (status & RFD_IPDetected) {
STGE_EVCNT_INCR(&sc->sc_ev_rxipsum);
- m->m_pkthdr.csum |= (status & RFD_IPError) ?
+ m->m_pkthdr.csum_flags |= (status & RFD_IPError) ?
M_IPV4_CSUM_IN_BAD : M_IPV4_CSUM_IN_OK;
if (status & RFD_TCPDetected) {
STGE_EVCNT_INCR(&sc->sc_ev_rxtcpsum);
- m->m_pkthdr.csum |= (status & RFD_TCPError) ?
+ m->m_pkthdr.csum_flags |= (status & RFD_TCPError) ?
M_TCP_CSUM_IN_BAD : M_TCP_CSUM_IN_OK;
} else if (status & RFD_UDPDetected) {
STGE_EVCNT_INCR(&sc->sc_ev_rxudpsum);
- m->m_pkthdr.csum |= (status & RFD_UDPError) ?
+ m->m_pkthdr.csum_flags |= (status & RFD_UDPError) ?
M_UDP_CSUM_IN_BAD : M_UDP_CSUM_IN_OK;
}
}
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 93f02c5cc10..b8c2733e3b7 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ti.c,v 1.59 2005/04/18 00:04:11 brad Exp $ */
+/* $OpenBSD: if_ti.c,v 1.60 2005/04/25 17:55:51 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -1903,7 +1903,7 @@ void ti_rxeof(sc)
sumflags |= M_IPV4_CSUM_IN_OK;
else
sumflags |= M_IPV4_CSUM_IN_BAD;
- m->m_pkthdr.csum = sumflags;
+ m->m_pkthdr.csum_flags = sumflags;
sumflags = 0;
#if NVLAN > 0
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 31b968af97c..7a9280d22b5 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.76 2005/01/15 05:24:11 brad Exp $ */
+/* $OpenBSD: if_txp.c,v 1.77 2005/04/25 17:55:51 brad Exp $ */
/*
* Copyright (c) 2001
@@ -723,7 +723,7 @@ txp_rx_reclaim(sc, r, dma)
else if (rxd->rx_stat & htole32(RX_STAT_UDPCKSUMGOOD))
sumflags |= M_UDP_CSUM_IN_OK;
- m->m_pkthdr.csum = sumflags;
+ m->m_pkthdr.csum_flags = sumflags;
#if NVLAN > 0
if (rxd->rx_stat & htole32(RX_STAT_VLAN)) {
@@ -1441,14 +1441,14 @@ txp_start(ifp)
}
#endif
- if (m->m_pkthdr.csum & M_IPV4_CSUM_OUT)
+ 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 & M_TCPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
txd->tx_pflags |= TX_PFLAGS_TCPCKSUM;
#endif
#ifdef TRY_TX_UDP_CSUM
- if (m->m_pkthdr.csum & M_UDPV4_CSUM_OUT)
+ if (m->m_pkthdr.csum_flags & M_UDPV4_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 debc85bd2bb..92c814f5389 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.10 2005/04/08 15:15:52 brad Exp $ */
+/* $OpenBSD: if_vge.c,v 1.11 2005/04/25 17:55:51 brad Exp $ */
/* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */
/*
* Copyright (c) 2004
@@ -1124,12 +1124,12 @@ vge_rxeof(struct vge_softc *sc)
/* Check IP header checksum */
if ((rxctl & VGE_RDCTL_IPPKT) &&
(rxctl & VGE_RDCTL_IPCSUMOK))
- m->m_pkthdr.csum |= M_IPV4_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
/* Check TCP/UDP checksum */
- if (rxctl & (VGE_RDCTL_TCPPKT|VGE_RDCTL_UDPPKT) &&
+ if ((rxctl & (VGE_RDCTL_TCPPKT|VGE_RDCTL_UDPPKT)) &&
(rxctl & VGE_RDCTL_PROTOCSUMOK))
- m->m_pkthdr.csum |= M_TCP_CSUM_IN_OK | M_UDP_CSUM_IN_OK;
+ m->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_OK | M_UDP_CSUM_IN_OK;
#ifdef VGE_VLAN
if (rxstat & VGE_RDSTS_VTAG)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 22:32:18 +0000