From: David S. Miller Date: Fri, 22 May 2020 20:48:24 +0000 (-0700) Subject: Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Tag: v5.15~3723^2~142 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b1b843a1e413d0d796cdd557c2592eb0ccd35c9;p=platform%2Fkernel%2Flinux-starfive.git Merge branch '1GbE' of git://git./linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== 1GbE Intel Wired LAN Driver Updates 2020-05-21 This series contains updates to igc and e1000. Andre cleans up code that was left over from the igb driver that handled MAC address filters based on the source address, which is not currently supported. Simplifies the MAC address filtering code and prepare the igc driver for future source address support. Updated the MAC address filter internal APIs to support filters based on source address. Added support for Network Flow Classification (NFC) rules based on source MAC address. Cleaned up the 'cookie' field which is not used anywhere in the code and cleaned up a wrapper function that was not needed. Simplified the filtering code for readability and aligned the ethtool functions, so that function names were consistent. Alex provides a fix for e1000 to resolve a deadlock issue when NAPI is being disabled. Sasha does additional cleanup of the igc driver of dead code that is not used or needed. v2: Fix the function header comment in patch 3 of the series, based on the feedback from Jakub Kicinski. ==================== Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller --- 7b1b843a1e413d0d796cdd557c2592eb0ccd35c9