diff options
author | David S. Miller <davem@davemloft.net> | 2018-06-12 02:30:23 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-06-12 02:30:23 +0200 |
commit | 93ba168ad4c771b9b37bd28230fc5e7f285ccff9 (patch) | |
tree | 67546b43e5c2c10ef21da2026bcda4e4a97870f3 /kernel | |
parent | net/ipv6: Ensure cfg is properly initialized in ipv6_create_tempaddr (diff) | |
parent | ixgbe: Fix bit definitions and add support for testing for ipsec support (diff) | |
download | linux-93ba168ad4c771b9b37bd28230fc5e7f285ccff9.tar.xz linux-93ba168ad4c771b9b37bd28230fc5e7f285ccff9.zip |
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2018-06-11
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions