From owner-svn-src-stable@freebsd.org  Thu Nov  9 19:15:30 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 1DB35E59184;
 Thu,  9 Nov 2017 19:15:30 +0000 (UTC)
 (envelope-from hselasky@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 D546373FAD;
 Thu,  9 Nov 2017 19:15:29 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA9JFSGU040894;
 Thu, 9 Nov 2017 19:15:28 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA9JFSK3040893;
 Thu, 9 Nov 2017 19:15:28 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201711091915.vA9JFSK3040893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 9 Nov 2017 19:15:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r325613 - stable/10/sys/ofed/include/linux
X-SVN-Group: stable-10
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/10/sys/ofed/include/linux
X-SVN-Commit-Revision: 325613
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Nov 2017 19:15:30 -0000

Author: hselasky
Date: Thu Nov  9 19:15:28 2017
New Revision: 325613
URL: https://svnweb.freebsd.org/changeset/base/325613

Log:
  MFC r325278:
  Unconditionally include "opt_inet6.h" in the LinuxKPI.
  This makes sure the INET6 macro gets properly defined,
  also for kernel module builds.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/ofed/include/linux/in6.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ofed/include/linux/in6.h
==============================================================================
--- stable/10/sys/ofed/include/linux/in6.h	Thu Nov  9 19:08:30 2017	(r325612)
+++ stable/10/sys/ofed/include/linux/in6.h	Thu Nov  9 19:15:28 2017	(r325613)
@@ -30,8 +30,6 @@
 #ifndef	_LINUX_IN6_H_
 #define	_LINUX_IN6_H_
 
-#ifndef KLD_MODULE
 #include "opt_inet6.h"
-#endif
 
 #endif	/* _LINUX_IN6_H_ */