From owner-svn-src-user@FreeBSD.ORG Fri Oct 25 01:49:09 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 86B3EB3B; Fri, 25 Oct 2013 01:49:09 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5AD912F35; Fri, 25 Oct 2013 01:49:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9P1n9fO032289; Fri, 25 Oct 2013 01:49:09 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9P1n9aE032288; Fri, 25 Oct 2013 01:49:09 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310250149.r9P1n9aE032288@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 25 Oct 2013 01:49:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257087 - user/ae/inet6/sys/netinet6 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2013 01:49:09 -0000 Author: ae Date: Fri Oct 25 01:49:08 2013 New Revision: 257087 URL: http://svnweb.freebsd.org/changeset/base/257087 Log: Don't adjust checksum, since addresses don't contain scope id anymore. Modified: user/ae/inet6/sys/netinet6/in6_cksum.c Modified: user/ae/inet6/sys/netinet6/in6_cksum.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6_cksum.c Fri Oct 25 01:47:02 2013 (r257086) +++ user/ae/inet6/sys/netinet6/in6_cksum.c Fri Oct 25 01:49:08 2013 (r257087) @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include /* * Checksum routine for Internet Protocol family headers (Portable Version). @@ -84,7 +83,7 @@ static int _in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) { int sum; - uint16_t scope, *w; + uint16_t *w; union { u_int16_t phs[4]; struct { @@ -108,20 +107,14 @@ _in6_cksum_pseudo(struct ip6_hdr *ip6, u sum += uph.phs[2]; sum += uph.phs[3]; /* IPv6 source address. */ - scope = in6_getscope(&ip6->ip6_src); w = (u_int16_t *)&ip6->ip6_src; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - if (scope != 0) - sum -= scope; /* IPv6 destination address. */ - scope = in6_getscope(&ip6->ip6_dst); w = (u_int16_t *)&ip6->ip6_dst; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - if (scope != 0) - sum -= scope; return (sum); } @@ -150,7 +143,7 @@ int in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len) { struct ip6_hdr *ip6; - u_int16_t *w, scope; + u_int16_t *w; int byte_swapped, mlen; int sum; union { @@ -188,20 +181,14 @@ in6_cksum(struct mbuf *m, u_int8_t nxt, ip6 = mtod(m, struct ip6_hdr *); /* IPv6 source address. */ - scope = in6_getscope(&ip6->ip6_src); w = (u_int16_t *)&ip6->ip6_src; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - if (scope != 0) - sum -= scope; /* IPv6 destination address. */ - scope = in6_getscope(&ip6->ip6_dst); w = (u_int16_t *)&ip6->ip6_dst; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - if (scope != 0) - sum -= scope; /* * Secondly calculate a summary of the first mbuf excluding offset.