diff options
| author | Michael Tuexen <tuexen@fh-muenster.de> | 2017-12-07 23:57:23 +0100 |
|---|---|---|
| committer | Michael Tuexen <tuexen@fh-muenster.de> | 2017-12-07 23:57:23 +0100 |
| commit | a5d920f3305b9368b4b18575263db9c75325db14 (patch) | |
| tree | 18f716f90b8b7a2da81708293b54b73755db2202 /usrsctplib/netinet6 | |
| parent | 0e076261b832121cf120ddc04aaff87ac3a34d30 (diff) | |
| download | usrsctp-a5d920f3305b9368b4b18575263db9c75325db14.tar.gz | |
Retire SCTP_WITH_NO_CSUM.
Diffstat (limited to 'usrsctplib/netinet6')
| -rw-r--r-- | usrsctplib/netinet6/sctp6_usrreq.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usrsctplib/netinet6/sctp6_usrreq.c b/usrsctplib/netinet6/sctp6_usrreq.c index 752f52bc..897b4da5 100644 --- a/usrsctplib/netinet6/sctp6_usrreq.c +++ b/usrsctplib/netinet6/sctp6_usrreq.c @@ -34,7 +34,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 325370 2017-11-03 20:46:12Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 326672 2017-12-07 22:19:08Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -151,9 +151,7 @@ sctp6_input(struct mbuf **i_pak, int *offp, int proto) struct sctphdr *sh; struct sctp_chunkhdr *ch; int length, offset; -#if !defined(SCTP_WITH_NO_CSUM) uint8_t compute_crc; -#endif #if defined(__FreeBSD__) uint32_t mflowid; uint8_t mflowtype; @@ -292,9 +290,6 @@ sctp6_input(struct mbuf **i_pak, int *offp, int proto) goto out; } ecn_bits = ((ntohl(ip6->ip6_flow) >> 20) & 0x000000ff); -#if defined(SCTP_WITH_NO_CSUM) - SCTP_STAT_INCR(sctps_recvnocrc); -#else #if defined(__FreeBSD__) && __FreeBSD_version >= 800000 if (m->m_pkthdr.csum_flags & CSUM_SCTP_VALID) { SCTP_STAT_INCR(sctps_recvhwcrc); @@ -303,21 +298,18 @@ sctp6_input(struct mbuf **i_pak, int *offp, int proto) #else if (SCTP_BASE_SYSCTL(sctp_no_csum_on_loopback) && (IN6_ARE_ADDR_EQUAL(&src.sin6_addr, &dst.sin6_addr))) { - SCTP_STAT_INCR(sctps_recvnocrc); + SCTP_STAT_INCR(sctps_recvhwcrc); compute_crc = 0; } else { #endif SCTP_STAT_INCR(sctps_recvswcrc); compute_crc = 1; } -#endif sctp_common_input_processing(&m, iphlen, offset, length, (struct sockaddr *)&src, (struct sockaddr *)&dst, sh, ch, -#if !defined(SCTP_WITH_NO_CSUM) compute_crc, -#endif ecn_bits, #if defined(__FreeBSD__) mflowtype, mflowid, fibnum, |