aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000/e1000_main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-07 00:06:38 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-07 00:06:38 -0400
commitde6099e27ef33086d7a967bbfce078952312b74d (patch)
tree56cd02272f18f36d9e9c7fda6c2cfac96c1a52c6 /drivers/net/ethernet/intel/e1000/e1000_main.c
parentMerge branch 'mlxsw-dcb' (diff)
parenti40evf: properly handle VLAN features (diff)
downloadlinux-dev-de6099e27ef33086d7a967bbfce078952312b74d.tar.xz
linux-dev-de6099e27ef33086d7a967bbfce078952312b74d.zip
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-04-06 This series contains updates to i40e and i40evf. Deepthi adds a debug message to display the MSIx vector count for hardware capabilities. Shannon removed the setting of debug_mask at startup to take care of an issue where all the device capabilities getting printed when we had not asked for it. Moved the NVM status out of the admin queue structure, since it should really stay with the other NVM data structures. Akeem added the flush routine to the end of the reset flow to avoid problems in the pass-through routines. Jesse moves a local variable deeper into the depths of the driver where the light is low and the context is great. Then cleaned up the tx_ring argument since it was not making good arguments. Improved performance by not "checking for FCoE" by re-ordering the FCoE checks. Anjali adds the support for changing a VF from non-trusted to trusted and vice-versa. Mitch adds opcodes and structures to support RSS configuration by PF driver on behalf of the VF driver. Fixed how the VLAN feature flags are set. Kiran added defines for RSS, flow director, flexible payload and IPv6. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_main.c')
0 files changed, 0 insertions, 0 deletions