aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-09 17:35:37 -0400
committerDavid S. Miller <davem@davemloft.net>2015-04-09 17:35:37 -0400
commit2e9095234daa5ac3aa5f53f66b00c92d32271343 (patch)
tree151a992115b3e39a98463e81af367312cbfbf78b /net/ipv4/tcp_ipv4.c
parentnet: Pass VLAN ID to rtnl_fdb_notify. (diff)
parentamd-xgbe: Add support for the netdev Tx watchdog (diff)
downloadlinux-dev-2e9095234daa5ac3aa5f53f66b00c92d32271343.tar.xz
linux-dev-2e9095234daa5ac3aa5f53f66b00c92d32271343.zip
Merge branch 'xgbe-next'
Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver updates 2015-04-09 The following series of patches includes functional updates and changes to the driver. - Allow ethtool rx-frames coalescing to be changed while the device is up - Consolidate initialization routine into the init function - Add support for the TX watchdog timeout This patch series is based on net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
0 files changed, 0 insertions, 0 deletions