diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-04-05 18:01:22 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-04-05 18:01:22 +0000 |
| commit | 4dc54e7fa6438c983dcb9497296699860bc13f41 (patch) | |
| tree | 0615f65c34b4f93226b68db35c1fe3bf9b830f59 /sys/net | |
| parent | d4c4b70e6b80a4fccfa10cfd0afd5597c8859890 (diff) | |
mechanic rename M_{TCP|UDP}V4_CSUM_OUT -> M_{TCP|UDP}_CSUM_OUT
ok claudio krw
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_bridge.c | 6 | ||||
| -rw-r--r-- | sys/net/if_pflow.c | 4 | ||||
| -rw-r--r-- | sys/net/pf.c | 6 | ||||
| -rw-r--r-- | sys/net/pipex.c | 4 |
4 files changed, 10 insertions, 10 deletions
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.")); |