From: David S. Miller Date: Sat, 18 Jan 2014 03:14:05 +0000 (-0800) Subject: Merge branch 'i40e' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=144651d1f3ea374781fe3aa016dd05d7c4bd5ac6;p=linux-beck.git Merge branch 'i40e' Aaron Brown says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e. Neerav implements DCB and DCBNL support and adds DCB options to Kconfig. DCB is disabled by default. Anjali refactors flow control director to fix inconsistencies that were preventing clean unloads of the driver, move the queues for handling flow director error into their own hardware VSI and implement a corrected version of the basic ethtool add ntuple rule. Jesse provides fixes for a compiler warning, firmware workaround, white space fixes and renames some defines. Shannon reworks the device ID #defines to follow the DEV_ID_ convention followed by our other drivers. ==================== Signed-off-by: David S. Miller --- 144651d1f3ea374781fe3aa016dd05d7c4bd5ac6