From: David S. Miller Date: Wed, 17 Feb 2016 20:22:21 +0000 (-0500) Subject: Merge branch 'amd-xgbe-next' X-Git-Tag: next-20160301~76^2~68 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=024af151155b55f8bd5250ab2e95373786d1e931;p=karo-tx-linux.git Merge branch 'amd-xgbe-next' Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver updates 2016-02-12 The following updates and fixes are included in this driver update series: - Disable VLAN filtering in promiscuous mode - Change from using napi_complete to napi_complete_done - Use __napi_schedule_irqoff when running in interrupt context - Verify ethtool speed setting is valid for the selected speedset - Enable PFC based on the pfc_en setting - Fix the mapping of priorities to traffic classes - Do traffic class setup when DCB nl callbacks are invoked - Check Rx queue fifos before stopping Rx queue DMA - Switch from disable_irq to masking interrupts for auto-negotiation This patch series is based on net-next. Changes from v1: - Removed #ifndef and #define of CRCPOLY_LE as part of the patch to disable VLAN filtering in promiscuous mode - Reworked changes to xgbe_setup_tc to resolve conflicts with commit 16e5cc647173 (net: rework setup_tc ndo op to consume general tc operand) ==================== Signed-off-by: David S. Miller --- 024af151155b55f8bd5250ab2e95373786d1e931