This series contains fixes to ixgbe IPsec and MACVLAN. Alex provides the 5 fixes in this series, starting with fixing an issue where num_rx_pools was not being populated until after the queues and interrupts were reinitialized when enabling MACVLAN interfaces. Updated to use CONFIG_XFRM_OFFLOAD instead of CONFIG_XFRM, since the code requires CONFIG_XFRM_OFFLOAD to be enabled. Moved the IPsec initialization function to be more consistent with the placement of similar initialization functions and before the call to reset the hardware, which will clean up any link issues that may have been introduced. Fixed the boolean logic that was testing for transmit OR receive ready bits, when it should have been testing for transmit AND receive ready bits. Fixed the bit definitions for SECTXSTAT and SECRXSTAT registers and ensure that if IPsec is disabled on the part, do not enable it.
The following are changes since commit f0dc7f9c6dd99891611fca5849cbc4c6965b690e: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 10GbE Alexander Duyck (5): ixgbe: Fix setting of TC configuration for macvlan case ixgbe: Use CONFIG_XFRM_OFFLOAD instead of CONFIG_XFRM ixgbe: Move ipsec init function to before reset call ixgbe: Avoid loopback and fix boolean logic in ipsec_stop_data ixgbe: Fix bit definitions and add support for testing for ipsec support drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 +-- .../net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 34 +++++++++++++------ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +++++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 21 ++++++------ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 ++-- 5 files changed, 48 insertions(+), 25 deletions(-) -- 2.17.1