summaryrefslogtreecommitdiffstats
path: root/include/net/netns/conntrack.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-12-07 19:03:23 -0500
committerDavid S. Miller <davem@davemloft.net>2016-12-07 19:03:23 -0500
commit63c36c40b9b031b760f89f5991843b6eeb6314e7 (patch)
tree452c84cbff7934aaf07118dfd2837091f23669a2 /include/net/netns/conntrack.h
parent25e3e84b183a2c25b1e8303f815a6aa5bf78358a (diff)
parent489a32650721b0e1e25283257cacb3a337014794 (diff)
downloadop-kernel-dev-63c36c40b9b031b760f89f5991843b6eeb6314e7.zip
op-kernel-dev-63c36c40b9b031b760f89f5991843b6eeb6314e7.tar.gz
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== 40GbE Intel Wired LAN Driver Updates 2016-12-07 This series contains updates to i40e and i40evf only. Filip modifies the i40e to log link speed change and when the link is brought up and down. Mitch replaces i40e_txd_use_count() with a new function which is slightly faster and better documented so the dim witted can better follow the code. Fixes the locking of the service task so that it is actually done in the service task and not in the scheduling function which calls the service task. Jacob, being the busy little beaver he is, provides most of the changes starting restores a workaround that is still needed in some configurations, specifically the Ethernet Controller XL710 for 40GbE QSFP+. Removes duplicate code and simplifies the i40e_vsi_add_vlan() and i40e_vsi_kill_vlan() functions. Removes detection of PTP frames over L4 (UDP) on the XL710 MAC, since there was a product decision to defeature it. Fixed a previous refactor of active filters which caused issues in the accounting of active_filters. Remaining work was done in the VLAN filters to improve readability and simplify code as much as possible to reduce inconsistencies. Alex fixes foul budget accounting in core code by returning actual work done, capped to budget-1. Henry fixes the "ethtool -p" function for 1G BaseT PHYs. Carolyn adds support for 25G devices for i40e and i40evf. Michal adds functions to apply the correct access method for external PHYs which could use Clause22 or Clause45 depending on the PHY. v2: dropped last patch from previous series, since changes are needed based on feedback from Sergei Shtylyov ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns/conntrack.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud