summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-10-01 15:43:58 -0700
committerDavid S. Miller <davem@davemloft.net>2018-10-01 15:43:58 -0700
commitd96112b2cab2db485bb43ea9cd2b24ce147cd730 (patch)
tree58d725f443930a8999a66ccbaba971ac8f8f16c9 /net/ipv4/tcp_input.c
parent804fe108fc92e591ddfe9447e7fb4691ed16daee (diff)
parent5df7e45d54fc99dd7c73e3a1f163cbfafc8b51f5 (diff)
downloadlinux-d96112b2cab2db485bb43ea9cd2b24ce147cd730.tar.bz2
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-10-01 This series contains updates to ice driver only. Anirudh provides several changes to "prep" the driver for upcoming features. Specifically, the functions that are used for PF VSI/netdev setup will also be used in SR-IOV support and to allow the reuse of these functions, code needs to move. Dave provides the only other change in the series, updates the driver to protect the reset patch in its entirety. This is done by adding the various bit checks to determine if a reset is scheduled/initiated and whether it came from the software or firmware. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions