Author: jfv
Date: Tue Mar 17 22:40:50 2015
New Revision: 280197
URL: https://svnweb.freebsd.org/changeset/base/280197
Log:
Resolve a few build issues, add module directories back into Makefile,
then correct a NETMAP problem resulting from the split, and finally
temporarily disable the X550 functionality.
Modified:
head/sys/dev/ixgbe/if_ixv.c
head/sys/dev/ixgbe/ix_txrx.c
head/sys/dev/ixgbe/ixgbe_api.c
head/sys/modules/Makefile
Modified: head/sys/dev/ixgbe/if_ixv.c
==============================================================================
--- head/sys/dev/ixgbe/if_ixv.c Tue Mar 17 22:00:11 2015 (r280196)
+++ head/sys/dev/ixgbe/if_ixv.c Tue Mar 17 22:40:50 2015 (r280197)
@@ -285,7 +285,7 @@ ixv_attach(device_t dev)
SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- OID_AUTO, "enable_aim", CTLTYPE_INT|CTLFLAG_RW,
+ OID_AUTO, "enable_aim", CTLFLAG_RW,
&ixv_enable_aim, 1, "Interrupt Moderation");
/* Set up the timer callout */
Modified: head/sys/dev/ixgbe/ix_txrx.c
==============================================================================
--- head/sys/dev/ixgbe/ix_txrx.c Tue Mar 17 22:00:11 2015
(r280196)
+++ head/sys/dev/ixgbe/ix_txrx.c Tue Mar 17 22:40:50 2015
(r280197)
@@ -45,6 +45,12 @@
#include <netinet/in_rss.h>
#endif
+#ifdef DEV_NETMAP
+#include <net/netmap.h>
+#include <sys/selinfo.h>
+#include <dev/netmap/netmap_kern.h>
+#endif
+
/*
** HW RSC control:
** this feature only works with
@@ -1233,6 +1239,7 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr)
rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL);
rdrxctl &= ~IXGBE_RDRXCTL_RSCFRSTSIZE;
#ifdef DEV_NETMAP /* crcstrip is optional in netmap */
+ extern int ix_crcstrip;
if (adapter->ifp->if_capenable & IFCAP_NETMAP && !ix_crcstrip)
#endif /* DEV_NETMAP */
rdrxctl |= IXGBE_RDRXCTL_CRCSTRIP;
Modified: head/sys/dev/ixgbe/ixgbe_api.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe_api.c Tue Mar 17 22:00:11 2015
(r280196)
+++ head/sys/dev/ixgbe/ixgbe_api.c Tue Mar 17 22:40:50 2015
(r280197)
@@ -81,6 +81,7 @@ s32 ixgbe_init_shared_code(struct ixgbe_
case ixgbe_mac_X540:
status = ixgbe_init_ops_X540(hw);
break;
+#if 0 //JFV temporary disable
case ixgbe_mac_X550:
status = ixgbe_init_ops_X550(hw);
break;
@@ -88,6 +89,7 @@ s32 ixgbe_init_shared_code(struct ixgbe_
case ixgbe_mac_X550EM_a:
status = ixgbe_init_ops_X550EM(hw);
break;
+#endif
case ixgbe_mac_82599_vf:
case ixgbe_mac_X540_vf:
case ixgbe_mac_X550_vf:
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Tue Mar 17 22:00:11 2015 (r280196)
+++ head/sys/modules/Makefile Tue Mar 17 22:40:50 2015 (r280197)
@@ -175,6 +175,8 @@ SUBDIR= \
${_iwn} \
${_iwnfw} \
${_ixgb} \
+ ${_ix} \
+ ${_ixv} \
${_ixl} \
${_ixlv} \
jme \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
