Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove #if 0 portion

This commit is contained in:
itojun 2003-07-18 06:45:33 +00:00
parent c658ee6379
commit 74182febed
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/netinet6/in6_cksum.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6_cksum.c,v 1.14 2002/09/27 15:37:53 provos Exp $ */ /* $NetBSD: in6_cksum.c,v 1.15 2003/07/18 06:45:33 itojun Exp $ */
/* $KAME: in6_cksum.c,v 1.9 2000/09/09 15:33:31 itojun Exp $ */ /* $KAME: in6_cksum.c,v 1.9 2000/09/09 15:33:31 itojun Exp $ */
/* /*
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in6_cksum.c,v 1.14 2002/09/27 15:37:53 provos Exp $"); __KERNEL_RCSID(0, "$NetBSD: in6_cksum.c,v 1.15 2003/07/18 06:45:33 itojun Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/mbuf.h> #include <sys/mbuf.h>
@ -103,9 +103,6 @@ in6_cksum(m, nxt, off, len)
int sum = 0; int sum = 0;
int mlen = 0; int mlen = 0;
int byte_swapped = 0; int byte_swapped = 0;
#if 0
int srcifid = 0, dstifid = 0;
#endif
struct ip6_hdr *ip6; struct ip6_hdr *ip6;
union { union {
u_int16_t phs[4]; u_int16_t phs[4];
@ -140,16 +137,6 @@ in6_cksum(m, nxt, off, len)
* First create IP6 pseudo header and calculate a summary. * First create IP6 pseudo header and calculate a summary.
*/ */
ip6 = mtod(m, struct ip6_hdr *); ip6 = mtod(m, struct ip6_hdr *);
#if 0
if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_src)) {
srcifid = ip6->ip6_src.s6_addr16[1];
ip6->ip6_src.s6_addr16[1] = 0;
}
if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) {
dstifid = ip6->ip6_dst.s6_addr16[1];
ip6->ip6_dst.s6_addr16[1] = 0;
}
#endif
w = (u_int16_t *)&ip6->ip6_src; w = (u_int16_t *)&ip6->ip6_src;
uph.ph.ph_len = htonl(len); uph.ph.ph_len = htonl(len);
uph.ph.ph_nxt = nxt; uph.ph.ph_nxt = nxt;
@ -170,12 +157,6 @@ in6_cksum(m, nxt, off, len)
sum += uph.phs[0]; sum += uph.phs[1]; sum += uph.phs[0]; sum += uph.phs[1];
sum += uph.phs[2]; sum += uph.phs[3]; sum += uph.phs[2]; sum += uph.phs[3];
#if 0
if (srcifid)
ip6->ip6_src.s6_addr16[1] = srcifid;
if (dstifid)
ip6->ip6_dst.s6_addr16[1] = dstifid;
#endif
skip_phdr: skip_phdr:
/* /*
* Secondly calculate a summary of the first mbuf excluding offset. * Secondly calculate a summary of the first mbuf excluding offset.