MFC ixgbe commits for 10.2:

- r280182 - Split the driver into independent pf/vf loadables
- r280197 - Resolve build issues
- r280204 - Fix multiple same-name devclasses
- r280228 - Fix i386 LINT build issues / remove unused variable
- r280252 - Fix building ixgbe with gcc
- r280962 - Make changes to busdma code similar to r257541
- r281772 & r281773 - Remove unused variable
- partial r282280 - stats counter update (ix-only)
- r282289 - Add X550 support
- r282290 - Add X550 makefile updates
- r282293 - Add ixgbe_x550.c to conf/files
- r282299 - Fix gcc compile (extraneous extern declaration)

Finally, add ix_txrx.c to conf/files because it's required for compile in stable/10.

Approved by:	jfv (mentor)

3 files changed, 32 insertions, 1 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 3346375..80b44f7 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -172,7 +172,8 @@ SUBDIR=	\
 	${_iwn} \
 	${_iwnfw} \
 	${_ixgb} \
-	${_ixgbe} \
+	${_ix} \
+	${_ixv} \
 	${_ixl} \
 	${_ixlv} \
 	jme \
diff --git a/sys/modules/ix/Makefile b/sys/modules/ix/Makefile
new file mode 100644
index 0000000..1f30cb0
--- /dev/null
+++ b/sys/modules/ix/Makefile
@@ -0,0 +1,15 @@
+#$FreeBSD$
+
+.PATH:  ${.CURDIR}/../../dev/ixgbe
+
+KMOD    = if_ix
+SRCS    = device_if.h bus_if.h pci_if.h
+SRCS	+= opt_inet.h opt_inet6.h opt_rss.h
+SRCS    += if_ix.c ix_txrx.c
+# Shared source
+SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
+SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
+SRCS    += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
+CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/ixv/Makefile b/sys/modules/ixv/Makefile
new file mode 100644
index 0000000..f8ce347
--- /dev/null
+++ b/sys/modules/ixv/Makefile
@@ -0,0 +1,15 @@
+#$FreeBSD$
+
+.PATH:  ${.CURDIR}/../../dev/ixgbe
+
+KMOD    = if_ixv
+SRCS    = device_if.h bus_if.h pci_if.h
+SRCS	+= opt_inet.h opt_inet6.h opt_rss.h
+SRCS    += if_ixv.c ix_txrx.c
+# Shared source
+SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
+SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
+SRCS    += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
+CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
+
+.include <bsd.kmod.mk>