From owner-svn-src-head@FreeBSD.ORG Mon Oct 15 07:57:55 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CE562E7A; Mon, 15 Oct 2012 07:57:55 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B63F68FC0A; Mon, 15 Oct 2012 07:57:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9F7vtpf043853; Mon, 15 Oct 2012 07:57:55 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9F7vtQg043851; Mon, 15 Oct 2012 07:57:55 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201210150757.q9F7vtQg043851@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 15 Oct 2012 07:57:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r241575 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2012 07:57:55 -0000 Author: glebius Date: Mon Oct 15 07:57:55 2012 New Revision: 241575 URL: http://svn.freebsd.org/changeset/base/241575 Log: We don't need to convert ip6_len to host byte order before ip6_output(), the IPv6 stack is working in net byte order. The reason this code worked before is that ip6_output() doesn't look at ip6_plen at all and recalculates it based on mbuf length. Modified: head/sys/netinet/ip_divert.c Modified: head/sys/netinet/ip_divert.c ============================================================================== --- head/sys/netinet/ip_divert.c Mon Oct 15 06:48:50 2012 (r241574) +++ head/sys/netinet/ip_divert.c Mon Oct 15 07:57:55 2012 (r241575) @@ -402,8 +402,6 @@ div_output(struct socket *so, struct mbu INP_RUNLOCK(inp); goto cantsend; } - - ip6->ip6_plen = ntohs(ip6->ip6_plen); break; } #endif