From owner-svn-src-head@FreeBSD.ORG  Fri Jul 12 21:14:43 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6AA43C6D;
 Fri, 12 Jul 2013 21:14:43 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5B7961F51;
 Fri, 12 Jul 2013 21:14:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6CLEhNg051072;
 Fri, 12 Jul 2013 21:14:43 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6CLEhFk051071;
 Fri, 12 Jul 2013 21:14:43 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201307122114.r6CLEhFk051071@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Fri, 12 Jul 2013 21:14:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253284 - head/sys/dev/ixgbe
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jul 2013 21:14:43 -0000

Author: jfv
Date: Fri Jul 12 21:14:42 2013
New Revision: 253284
URL: http://svnweb.freebsd.org/changeset/base/253284

Log:
  Remove the conditional define around the option headers,
  when building the driver as a module the result of the present
  system results in INET and INET6 being undefined, and will cause
  the panic in ixgbe_tso_setup(). The Makefile in the module directory
  now renders the conditional in the source unnecessary and wrong.
  
  MFC after: ASAP - the panic as a module must not get into 9.2

Modified:
  head/sys/dev/ixgbe/ixgbe.c

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Fri Jul 12 20:06:52 2013	(r253283)
+++ head/sys/dev/ixgbe/ixgbe.c	Fri Jul 12 21:14:42 2013	(r253284)
@@ -33,11 +33,8 @@
 /*$FreeBSD$*/
 
 
-#ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#endif
-
 #include "ixgbe.h"
 
 /*********************************************************************