diff options
-rw-r--r-- | sys/arch/sparc/dev/hme.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/elink3.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/hme.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/re.c | 12 | ||||
-rw-r--r-- | sys/dev/ic/xl.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_bge.c | 10 | ||||
-rw-r--r-- | sys/dev/pci/if_em.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/if_lge.c | 14 | ||||
-rw-r--r-- | sys/dev/pci/if_nge.c | 22 | ||||
-rw-r--r-- | sys/dev/pci/if_san_xilinx.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/if_sk.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/if_stge.c | 14 | ||||
-rw-r--r-- | sys/dev/pci/if_ti.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/if_txp.c | 10 | ||||
-rw-r--r-- | sys/dev/pci/if_vge.c | 8 | ||||
-rw-r--r-- | sys/net/if_bridge.c | 8 | ||||
-rw-r--r-- | sys/net/pf.c | 24 | ||||
-rw-r--r-- | sys/netinet/ip_input.c | 8 | ||||
-rw-r--r-- | sys/netinet/ip_mroute.c | 10 | ||||
-rw-r--r-- | sys/netinet/ip_output.c | 32 | ||||
-rw-r--r-- | sys/netinet/tcp_input.c | 8 | ||||
-rw-r--r-- | sys/netinet/tcp_output.c | 4 | ||||
-rw-r--r-- | sys/netinet/udp_usrreq.c | 10 | ||||
-rw-r--r-- | sys/sys/mbuf.h | 6 |
24 files changed, 121 insertions, 121 deletions
diff --git a/sys/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c index fe6fde31be0..78db38ed1e1 100644 --- a/sys/arch/sparc/dev/hme.c +++ b/sys/arch/sparc/dev/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.47 2005/02/22 20:44:26 brad Exp $ */ +/* $OpenBSD: hme.c,v 1.48 2005/04/25 17:55:50 brad Exp $ */ /* * Copyright (c) 1998 Jason L. Wright (jason@thought.net) @@ -845,9 +845,9 @@ hme_rxcksum(struct mbuf *m, u_int32_t flags) temp32 += (temp32 >> 16); cksum = ~temp32; if (cksum != 0) - m->m_pkthdr.csum |= flag_bad; + m->m_pkthdr.csum_flags |= flag_bad; else - m->m_pkthdr.csum |= flag_ok; + m->m_pkthdr.csum_flags |= flag_ok; } int diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index d6f01ca6174..287466883a9 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.63 2005/01/15 05:24:11 brad Exp $ */ +/* $OpenBSD: elink3.c,v 1.64 2005/04/25 17:55:50 brad Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -1393,7 +1393,7 @@ epget(sc, totlen) m->m_data = m->m_pktdat; m->m_flags = M_PKTHDR; m_tag_init(m); - m->m_pkthdr.csum = 0; + m->m_pkthdr.csum_flags = 0; } m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = totlen; diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index 5c082d70c02..019526d998b 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.35 2005/02/04 05:02:38 brad Exp $ */ +/* $OpenBSD: hme.c,v 1.36 2005/04/25 17:55:51 brad Exp $ */ /* $NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $ */ /*- @@ -828,9 +828,9 @@ hme_rxcksum(struct mbuf *m, u_int32_t flags) temp32 += (temp32 >> 16); cksum = ~temp32; if (cksum != 0) - m->m_pkthdr.csum |= flag_bad; + m->m_pkthdr.csum_flags |= flag_bad; else - m->m_pkthdr.csum |= flag_ok; + m->m_pkthdr.csum_flags |= flag_ok; } /* diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index fc83e48b9bb..a10099b356e 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.8 2005/04/15 03:16:07 brad Exp $ */ +/* $OpenBSD: re.c,v 1.9 2005/04/25 17:55:51 brad Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -1192,14 +1192,14 @@ re_rxeof(sc) /* Check IP header checksum */ if ((rxstat & RL_RDESC_STAT_PROTOID) && !(rxstat & RL_RDESC_STAT_IPSUMBAD)) - m->m_pkthdr.csum |= M_IPV4_CSUM_IN_OK; + m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK; /* Check TCP/UDP checksum */ if ((RL_TCPPKT(rxstat) && !(rxstat & RL_RDESC_STAT_TCPSUMBAD)) || (RL_UDPPKT(rxstat) && !(rxstat & RL_RDESC_STAT_UDPSUMBAD))) - 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 VLANXXX if (rxvlan & RL_RDESC_VLANCTL_TAG) { @@ -1452,11 +1452,11 @@ re_encap(sc, m_head, idx) rl_flags = 0; - if (m_head->m_pkthdr.csum & M_IPV4_CSUM_OUT) + if (m_head->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT) rl_flags |= RL_TDESC_CMD_IPCSUM; - if (m_head->m_pkthdr.csum & M_TCPV4_CSUM_OUT) + if (m_head->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) rl_flags |= RL_TDESC_CMD_TCPCSUM; - if (m_head->m_pkthdr.csum & M_UDPV4_CSUM_OUT) + if (m_head->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) rl_flags |= RL_TDESC_CMD_UDPCSUM; map = sc->rl_ldata.rl_tx_dmamap[*idx]; diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 5cefc9199e1..38fde3ecbde 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.63 2005/04/23 22:51:28 brad Exp $ */ +/* $OpenBSD: xl.c,v 1.64 2005/04/25 17:55:51 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1327,7 +1327,7 @@ again: else if (rxstat & XL_RXSTAT_UDPCKOK) sumflags |= M_UDP_CSUM_IN_OK; - m->m_pkthdr.csum = sumflags; + m->m_pkthdr.csum_flags = sumflags; } ether_input_mbuf(ifp, m); } 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) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 827fc757f1d..2efe6328622 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.142 2005/04/25 01:34:27 brad Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.143 2005/04/25 17:55:51 brad Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -960,9 +960,9 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa, #endif /* IPSEC */ /* Catch packets that need TCP/UDP/IP hardware checksumming */ - if (m->m_pkthdr.csum & M_IPV4_CSUM_OUT || - m->m_pkthdr.csum & M_TCPV4_CSUM_OUT || - m->m_pkthdr.csum & M_UDPV4_CSUM_OUT) { + if (m->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT || + m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT || + m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) { m_freem(m); splx(s); return (0); diff --git a/sys/net/pf.c b/sys/net/pf.c index cff71acc1cc..198adb419c8 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.487 2005/04/22 09:53:18 dhartmei Exp $ */ +/* $OpenBSD: pf.c,v 1.488 2005/04/25 17:55:51 brad Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -5369,33 +5369,33 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, #endif /* IPSEC */ /* Catch routing changes wrt. hardware checksumming for TCP or UDP. */ - if (m0->m_pkthdr.csum & M_TCPV4_CSUM_OUT) { + if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) { if (!(ifp->if_capabilities & IFCAP_CSUM_TCPv4) || ifp->if_bridge != NULL) { in_delayed_cksum(m0); - m0->m_pkthdr.csum &= ~M_TCPV4_CSUM_OUT; /* Clear */ + m0->m_pkthdr.csum_flags &= ~M_TCPV4_CSUM_OUT; /* Clear */ } - } else if (m0->m_pkthdr.csum & M_UDPV4_CSUM_OUT) { + } else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) { if (!(ifp->if_capabilities & IFCAP_CSUM_UDPv4) || ifp->if_bridge != NULL) { in_delayed_cksum(m0); - m0->m_pkthdr.csum &= ~M_UDPV4_CSUM_OUT; /* Clear */ + m0->m_pkthdr.csum_flags &= ~M_UDPV4_CSUM_OUT; /* Clear */ } } if (ntohs(ip->ip_len) <= ifp->if_mtu) { if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { - m0->m_pkthdr.csum |= M_IPV4_CSUM_OUT; + m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; ipstat.ips_outhwcsum++; } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } /* Update relevant hardware checksum stats for TCP/UDP */ - if (m0->m_pkthdr.csum & M_TCPV4_CSUM_OUT) + if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) tcpstat.tcps_outhwcsum++; - else if (m0->m_pkthdr.csum & M_UDPV4_CSUM_OUT) + else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) udpstat.udps_outhwcsum++; error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL); goto done; @@ -5612,9 +5612,9 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, default: return (1); } - if (m->m_pkthdr.csum & flag_ok) + if (m->m_pkthdr.csum_flags & flag_ok) return (0); - if (m->m_pkthdr.csum & flag_bad) + if (m->m_pkthdr.csum_flags & flag_bad) return (1); if (off < sizeof(struct ip) || len < sizeof(struct udphdr)) return (1); @@ -5649,7 +5649,7 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, return (1); } if (sum) { - m->m_pkthdr.csum |= flag_bad; + m->m_pkthdr.csum_flags |= flag_bad; switch (p) { case IPPROTO_TCP: tcpstat.tcps_rcvbadsum++; @@ -5668,7 +5668,7 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, } return (1); } - m->m_pkthdr.csum |= flag_ok; + m->m_pkthdr.csum_flags |= flag_ok; return (0); } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 09d452dbe05..7bb92700d08 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.125 2005/01/20 15:00:13 markus Exp $ */ +/* $OpenBSD: ip_input.c,v 1.126 2005/04/25 17:55:51 brad Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -320,8 +320,8 @@ ipv4_input(m) } } - if ((m->m_pkthdr.csum & M_IPV4_CSUM_IN_OK) == 0) { - if (m->m_pkthdr.csum & M_IPV4_CSUM_IN_BAD) { + if ((m->m_pkthdr.csum_flags & M_IPV4_CSUM_IN_OK) == 0) { + if (m->m_pkthdr.csum_flags & M_IPV4_CSUM_IN_BAD) { ipstat.ips_inhwcsum++; ipstat.ips_badsum++; goto bad; @@ -332,7 +332,7 @@ ipv4_input(m) goto bad; } } else { - m->m_pkthdr.csum &= ~M_IPV4_CSUM_IN_OK; + m->m_pkthdr.csum_flags &= ~M_IPV4_CSUM_IN_OK; ipstat.ips_inhwcsum++; } diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 482d63b5eeb..85c32162088 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.41 2005/01/15 04:43:40 brad Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.42 2005/04/25 17:55:51 brad Exp $ */ /* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */ /* @@ -1872,9 +1872,9 @@ encap_send(struct ip *ip, struct vif *vifp, struct mbuf *m) int i, len = ntohs(ip->ip_len) + sizeof(multicast_encap_iphdr); /* Take care of delayed checksums */ - if (m->m_pkthdr.csum & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { + if (m->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { in_delayed_cksum(m); - m->m_pkthdr.csum &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); + m->m_pkthdr.csum_flags &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); } /* @@ -3105,9 +3105,9 @@ pim_register_prepare(struct ip *ip, struct mbuf *m) int mtu; /* Take care of delayed checksums */ - if (m->m_pkthdr.csum & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { + if (m->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { in_delayed_cksum(m); - m->m_pkthdr.csum &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); + m->m_pkthdr.csum_flags &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); } /* diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index d81ff8af4cc..cdb0fa48949 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.169 2005/01/04 19:42:38 markus Exp $ */ +/* $OpenBSD: ip_output.c,v 1.170 2005/04/25 17:55:52 brad Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -315,9 +315,9 @@ ip_output(struct mbuf *m0, ...) * If it needs TCP/UDP hardware-checksumming, do the * computation now. */ - if (m->m_pkthdr.csum & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { + if (m->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { in_delayed_cksum(m); - m->m_pkthdr.csum &= + m->m_pkthdr.csum_flags &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); } @@ -477,10 +477,10 @@ ip_output(struct mbuf *m0, ...) * Can't defer TCP/UDP checksumming, do the * computation now. */ - if (m->m_pkthdr.csum & + if (m->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { in_delayed_cksum(m); - m->m_pkthdr.csum &= + m->m_pkthdr.csum_flags &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); } ip_mloopback(ifp, m, dst); @@ -654,17 +654,17 @@ sendit: #endif /* IPSEC */ /* Catch routing changes wrt. hardware checksumming for TCP or UDP. */ - if (m->m_pkthdr.csum & M_TCPV4_CSUM_OUT) { + if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) { if (!(ifp->if_capabilities & IFCAP_CSUM_TCPv4) || ifp->if_bridge != NULL) { in_delayed_cksum(m); - m->m_pkthdr.csum &= ~M_TCPV4_CSUM_OUT; /* Clear */ + m->m_pkthdr.csum_flags &= ~M_TCPV4_CSUM_OUT; /* Clear */ } - } else if (m->m_pkthdr.csum & M_UDPV4_CSUM_OUT) { + } else if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) { if (!(ifp->if_capabilities & IFCAP_CSUM_UDPv4) || ifp->if_bridge != NULL) { in_delayed_cksum(m); - m->m_pkthdr.csum &= ~M_UDPV4_CSUM_OUT; /* Clear */ + m->m_pkthdr.csum_flags &= ~M_UDPV4_CSUM_OUT; /* Clear */ } } @@ -699,16 +699,16 @@ sendit: if (ntohs(ip->ip_len) <= mtu) { if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { - m->m_pkthdr.csum |= M_IPV4_CSUM_OUT; + m->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; ipstat.ips_outhwcsum++; } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m, hlen); } /* Update relevant hardware checksum stats for TCP/UDP */ - if (m->m_pkthdr.csum & M_TCPV4_CSUM_OUT) + if (m->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) tcpstat.tcps_outhwcsum++; - else if (m->m_pkthdr.csum & M_UDPV4_CSUM_OUT) + else if (m->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) udpstat.udps_outhwcsum++; error = (*ifp->if_output)(ifp, m, sintosa(dst), ro->ro_rt); goto done; @@ -796,9 +796,9 @@ ip_fragment(struct mbuf *m, struct ifnet *ifp, u_long mtu) * If we are doing fragmentation, we can't defer TCP/UDP * checksumming; compute the checksum and clear the flag. */ - if (m->m_pkthdr.csum & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { + if (m->m_pkthdr.csum_flags & (M_TCPV4_CSUM_OUT | M_UDPV4_CSUM_OUT)) { in_delayed_cksum(m); - m->m_pkthdr.csum &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); + m->m_pkthdr.csum_flags &= ~(M_UDPV4_CSUM_OUT | M_TCPV4_CSUM_OUT); } firstlen = len; @@ -850,7 +850,7 @@ ip_fragment(struct mbuf *m, struct ifnet *ifp, u_long mtu) if ((ifp != NULL) && (ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { - m->m_pkthdr.csum |= M_IPV4_CSUM_OUT; + m->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; ipstat.ips_outhwcsum++; } else { mhip->ip_sum = 0; @@ -871,7 +871,7 @@ ip_fragment(struct mbuf *m, struct ifnet *ifp, u_long mtu) if ((ifp != NULL) && (ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { - m->m_pkthdr.csum |= M_IPV4_CSUM_OUT; + m->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; ipstat.ips_outhwcsum++; } else { ip->ip_sum = 0; diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index cc46ff0fef4..61f7c8940a7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.186 2005/04/05 20:27:35 markus Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.187 2005/04/25 17:55:52 brad Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -484,8 +484,8 @@ tcp_input(struct mbuf *m, ...) /* * Checksum extended TCP header and data. */ - if ((m->m_pkthdr.csum & M_TCP_CSUM_IN_OK) == 0) { - if (m->m_pkthdr.csum & M_TCP_CSUM_IN_BAD) { + if ((m->m_pkthdr.csum_flags & M_TCP_CSUM_IN_OK) == 0) { + if (m->m_pkthdr.csum_flags & M_TCP_CSUM_IN_BAD) { tcpstat.tcps_inhwcsum++; tcpstat.tcps_rcvbadsum++; goto drop; @@ -495,7 +495,7 @@ tcp_input(struct mbuf *m, ...) goto drop; } } else { - m->m_pkthdr.csum &= ~M_TCP_CSUM_IN_OK; + m->m_pkthdr.csum_flags &= ~M_TCP_CSUM_IN_OK; tcpstat.tcps_inhwcsum++; } break; diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 36aa624d0ba..5c57acaa65e 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.76 2005/04/05 20:27:35 markus Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.77 2005/04/25 17:55:52 brad Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -947,7 +947,7 @@ send: #ifdef INET case AF_INET: /* Defer checksumming until later (ip_output() or hardware) */ - m->m_pkthdr.csum |= M_TCPV4_CSUM_OUT; + m->m_pkthdr.csum_flags |= M_TCPV4_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 af11cdd1c51..3c449120b65 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.102 2004/08/10 20:11:04 markus Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.103 2005/04/25 17:55:52 brad Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -289,8 +289,8 @@ udp_input(struct mbuf *m, ...) } else #endif /* INET6 */ if (uh->uh_sum) { - if ((m->m_pkthdr.csum & M_UDP_CSUM_IN_OK) == 0) { - if (m->m_pkthdr.csum & M_UDP_CSUM_IN_BAD) { + if ((m->m_pkthdr.csum_flags & M_UDP_CSUM_IN_OK) == 0) { + if (m->m_pkthdr.csum_flags & M_UDP_CSUM_IN_BAD) { udpstat.udps_badsum++; udpstat.udps_inhwcsum++; m_freem(m); @@ -304,7 +304,7 @@ udp_input(struct mbuf *m, ...) return; } } else { - m->m_pkthdr.csum &= ~M_UDP_CSUM_IN_OK; + m->m_pkthdr.csum_flags &= ~M_UDP_CSUM_IN_OK; udpstat.udps_inhwcsum++; } } else @@ -990,7 +990,7 @@ udp_output(struct mbuf *m, ...) * until ip_output() or hardware (if it exists). */ if (udpcksum) { - m->m_pkthdr.csum |= M_UDPV4_CSUM_OUT; + m->m_pkthdr.csum_flags |= M_UDPV4_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 96ae046fed9..891aa51c0d9 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.80 2005/04/20 19:59:29 reyk Exp $ */ +/* $OpenBSD: mbuf.h,v 1.81 2005/04/25 17:55:52 brad Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -80,7 +80,7 @@ struct pkthdr { struct ifnet *rcvif; /* rcv interface */ SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */ int len; /* total packet length */ - int csum; /* Hardware checksum info */ + int csum_flags; /* checksum flags */ }; /* description of external storage mapped into mbuf, valid if M_EXT set */ @@ -231,7 +231,7 @@ struct mbuf *_sk_mget(int, int); (m)->m_data = (m)->m_pktdat; \ (m)->m_flags = M_PKTHDR; \ SLIST_INIT(&(m)->m_pkthdr.tags); \ - (m)->m_pkthdr.csum = 0; \ + (m)->m_pkthdr.csum_flags = 0; \ } \ } while (/* CONSTCOND */ 0) |