diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-03 15:02:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-03 15:02:55 -0700 |
| commit | 4189777ca84f3f576767119a005f810c53f39995 (patch) | |
| tree | 11ce8dd083587c83b47b281acb6155f3efeabb78 /net/caif | |
| parent | 86b84066dc8fbb93221000e60946960cf7d54587 (diff) | |
| parent | e102db780e1c14f10c70dafa7684af22a745b51d (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
This series contains updates to igb, igc, ixgbe, ixgbevf, i40e and ice
drivers.
Kurt Kanzenbach fixes XDP for igb when PTP is enabled by pulling the
timestamp and adjusting appropriate values prior to XDP operations.
Magnus adds missing exception tracing for XDP on igb, igc, ixgbe,
ixgbevf, i40e and ice drivers.
Maciej adds tracking of AF_XDP zero copy enabled queues to resolve an
issue with copy mode Tx for the ice driver.
Note: Patch 7 will conflict when merged with net-next. Please carry
these changes forward. IGC_XDP_TX and IGC_XDP_REDIRECT will need to be
changed to return to conform with the net-next changes. Let me know if
you have issues.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions