From: David S. Miller Date: Fri, 27 Jun 2014 00:14:16 +0000 (-0700) Subject: Merge branch 'xgbe-next' X-Git-Tag: v3.17-rc1~106^2~256 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f5b265039f1381ec048a4d61d47130f71abb119b;p=karo-tx-linux.git Merge branch 'xgbe-next' Tom Lendacky says: ==================== amd-xgbe: AMD 10Gb Ethernet driver updates The following series fixes some bugs and provides new/changed support in the driver. - Make all the defines in the xgbe.h file unique by prefixing them with XGBE_ if they are not currently using the prefix. - VLAN CTAGs are supplied in context descriptors. Tell the hardware to look in the Tx context descriptor, and not a register, for the VLAN CTAG to be inserted in the packet. - The hardware will indicate a VLAN packet has been received even if VLAN CTAG stripping is currently disabled. Only indicate that a VLAN CTAG has been stripped for the current packet if stripping is enabled. - Add support for VLAN filtering - Modify destination address filtering to use the hardware hash tables - Eliminate a checkpatch warning by replacing sscanf with kstrtouint This patch series is based on net-next. ==================== Signed-off-by: David S. Miller --- f5b265039f1381ec048a4d61d47130f71abb119b