From owner-svn-src-stable@FreeBSD.ORG  Fri Aug  9 00:39:20 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E0941A84;
 Fri,  9 Aug 2013 00:39:20 +0000 (UTC) (envelope-from jfv@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 CDB602EED;
 Fri,  9 Aug 2013 00:39:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r790dKbo035495;
 Fri, 9 Aug 2013 00:39:20 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r790dKFg035494;
 Fri, 9 Aug 2013 00:39:20 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201308090039.r790dKFg035494@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Fri, 9 Aug 2013 00:39:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r254114 - stable/9/sys/modules/ixgbe
X-SVN-Group: stable-9
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.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Aug 2013 00:39:21 -0000

Author: jfv
Date: Fri Aug  9 00:39:20 2013
New Revision: 254114
URL: http://svnweb.freebsd.org/changeset/base/254114

Log:
  MFC 235964,236311,247505
  	Add the INET opt file creation, module name change, and include
  	making the Makefile match HEAD.

Modified:
  stable/9/sys/modules/ixgbe/Makefile
Directory Properties:
  stable/9/sys/modules/ixgbe/   (props changed)

Modified: stable/9/sys/modules/ixgbe/Makefile
==============================================================================
--- stable/9/sys/modules/ixgbe/Makefile	Thu Aug  8 23:53:47 2013	(r254113)
+++ stable/9/sys/modules/ixgbe/Makefile	Fri Aug  9 00:39:20 2013	(r254114)
@@ -1,7 +1,12 @@
 #$FreeBSD$
+
+.include <bsd.own.mk>
+
 .PATH:  ${.CURDIR}/../../dev/ixgbe
-KMOD    = ixgbe
+
+KMOD    = if_ixgbe
 SRCS    = device_if.h bus_if.h pci_if.h
+SRCS	+= opt_inet.h opt_inet6.h
 SRCS    += ixgbe.c ixv.c
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
@@ -9,4 +14,16 @@ SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c
 SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
 
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
 .include <bsd.kmod.mk>