diff options
author | David S. Miller <davem@davemloft.net> | 2016-08-17 19:20:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-08-17 19:20:24 -0400 |
commit | f4abf05f54ddabacb702d1998296f3e610e62b23 (patch) | |
tree | 4fcc25cc68f0d1c862f48552888a47f4bc20d002 /net/sched/act_api.c | |
parent | 647f28c7274a776c3babc3893f530513845b3666 (diff) | |
parent | fbfe12c64f9650aa22f434dd9dd22df7ddf63221 (diff) | |
download | linux-f4abf05f54ddabacb702d1998296f3e610e62b23.tar.gz linux-f4abf05f54ddabacb702d1998296f3e610e62b23.tar.xz |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2016-08-16
This series contains fixes to e1000e, igb, ixgbe and i40e.
Kshitiz Gupta provides a fix for igb to resolve the PHY delay compensation
math in several functions.
Jarod Wilson provides a fix for e1000e which had to broken up into 2
patches, first is prepares the driver for expanding the list of NICs
that have occasional ~10 hour clock jumps when being used for PTP.
Second patch actually fixes i218 silicon which has been experiencing
the clock jumps while using PTP.
Alex provides 2 patches for ixgbe now that he is back at Intel. First
fixes setting VLNCTRL.VFE bit, which was left unchanged in earlier patches
which resulted in disabling VLAN filtering for all the VFs. Second
corrects the support for disabling the VLAN tag filtering via the
feature bit.
Lastly, David fixes i40e which was causing a kernel panic when
non-contiguous traffic classes or traffic classes not starting with TC0,
were configured on a link partner switch. To fix this, changed the
logic when determining the total number of TCs enabled.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_api.c')
0 files changed, 0 insertions, 0 deletions