From owner-svn-src-all@freebsd.org  Fri Mar 18 09:03:01 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4AEBAD3890;
 Fri, 18 Mar 2016 09:03:01 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 86EC2BB0;
 Fri, 18 Mar 2016 09:03:01 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2I9306a065782;
 Fri, 18 Mar 2016 09:03:00 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2I930nj065781;
 Fri, 18 Mar 2016 09:03:00 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201603180903.u2I930nj065781@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 18 Mar 2016 09:03:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297014 - head/sys/netipsec
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2016 09:03:01 -0000

Author: ae
Date: Fri Mar 18 09:03:00 2016
New Revision: 297014
URL: https://svnweb.freebsd.org/changeset/base/297014

Log:
  Fix handling of net.inet.ipsec.dfbit=2 variable.
  IP_DF macro is in host bytes order, but ip_off field is in network bytes
  order. So, use htons() for correct check.

Modified:
  head/sys/netipsec/ipsec_output.c

Modified: head/sys/netipsec/ipsec_output.c
==============================================================================
--- head/sys/netipsec/ipsec_output.c	Fri Mar 18 08:47:17 2016	(r297013)
+++ head/sys/netipsec/ipsec_output.c	Fri Mar 18 09:03:00 2016	(r297014)
@@ -441,7 +441,7 @@ ipsec_encap(struct mbuf **mp, struct sec
 			setdf = V_ip4_ipsec_dfbit;
 			break;
 		default:/* propagate to outer header */
-			setdf = (ip->ip_off & ntohs(IP_DF)) != 0;
+			setdf = (ip->ip_off & htons(IP_DF)) != 0;
 		}
 		itos = ip->ip_tos;
 		break;