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.
This commit is contained in:
parent
743ffdaf3c
commit
bc2e8d79c7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=280197
@ -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 */
|
||||
|
@ -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;
|
||||
|
@ -81,6 +81,7 @@ s32 ixgbe_init_shared_code(struct ixgbe_hw *hw)
|
||||
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_hw *hw)
|
||||
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:
|
||||
|
@ -175,6 +175,8 @@ SUBDIR= \
|
||||
${_iwn} \
|
||||
${_iwnfw} \
|
||||
${_ixgb} \
|
||||
${_ix} \
|
||||
${_ixv} \
|
||||
${_ixl} \
|
||||
${_ixlv} \
|
||||
jme \
|
||||
|
Loading…
Reference in New Issue
Block a user