diff options
author | David S. Miller <davem@davemloft.net> | 2018-05-10 17:31:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-05-10 17:31:03 -0400 |
commit | e72a7dd70c487aa5d8d00ac2647c7bf671bded13 (patch) | |
tree | 60542c96aa78bc6718649964fcca4cc98edfa83a /net/ipv6/tcp_ipv6.c | |
parent | 9e5750106630113ab112e8044ff7089d3e9c2906 (diff) | |
parent | 0a3e92de1be42b5dbed4b81f835740d3f58c5430 (diff) | |
download | linux-e72a7dd70c487aa5d8d00ac2647c7bf671bded13.tar.gz linux-e72a7dd70c487aa5d8d00ac2647c7bf671bded13.tar.bz2 linux-e72a7dd70c487aa5d8d00ac2647c7bf671bded13.zip |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
100GbE Intel Wired LAN Driver Updates 2018-05-09
This series contains updates to fm10k only.
Jake provides all the changes in the series, starting with adding
support for accelerated MACVLAN devices. Reduced code duplication by
implementing a macro to be used when setting up the type specific
macros. Avoided potential bugs with stats by using a macro to calculate
the array size when passing to ensure that the size is correct.
v2: changed macro reference '#' with __stringify() as suggested by
Joe Perches to patch 2 of the series. Also made sure the updated
series of patches is actually pushed to my kernel.org tree
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions