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/netinet | |
| parent | d4c4b70e6b80a4fccfa10cfd0afd5597c8859890 (diff) | |
mechanic rename M_{TCP|UDP}V4_CSUM_OUT -> M_{TCP|UDP}_CSUM_OUT
ok claudio krw
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_output.c | 14 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 4 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 4 |
3 files changed, 11 insertions, 11 deletions
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)); |