summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-26 17:14:16 -0700
committerDavid S. Miller <davem@davemloft.net>2014-06-26 17:14:16 -0700
commitf5b265039f1381ec048a4d61d47130f71abb119b (patch)
treed0c63d120b8f0a27afde54a8802eb2975e865b3f /net/tipc
parent9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (diff)
parent66f95c35c413f674a835034dc667099b44225df2 (diff)
downloadtalos-op-linux-f5b265039f1381ec048a4d61d47130f71abb119b.tar.gz
talos-op-linux-f5b265039f1381ec048a4d61d47130f71abb119b.zip
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 <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud