Flavio Leitner 6c37e5de45 TCP: avoid to send keepalive probes if receiving data ... RFC 1122 says the following: ... Keep-alive packets MUST only be sent when no data or acknowledgement packets have been received for the connection within an interval. ... The acknowledgement packet is reseting the keepalive timer but the data packet isn't. This patch fixes it by checking the timestamp of the last received data packet too when the keepalive timer expires. Signed-off-by: Flavio Leitner <fleitner@redhat.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>		2010-04-27 12:53:25 -07:00
..
9p	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs	2010-04-05 13:42:54 -07:00
802	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
8021q	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
appletalk	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
atm	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
ax25	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
bluetooth	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
bridge	bridge: multicast router list manipulation	2010-04-27 12:53:24 -07:00
caif	net: use sk_sleep()	2010-04-26 11:18:45 -07:00
can	can: avoids a false warning	2010-04-13 03:03:14 -07:00
core	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-27 12:49:13 -07:00
dcb	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dccp	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
decnet	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
dsa	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
econet	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ethernet	ethernet: print protocol in host byte order	2010-04-21 22:57:19 -07:00
ieee802154	ieee802154: Fix oops during ieee802154_sock_ioctl	2010-04-26 11:20:32 -07:00
ipv4	TCP: avoid to send keepalive probes if receiving data	2010-04-27 12:53:25 -07:00
ipv6	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-27 12:49:13 -07:00
ipx	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
irda	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
iucv	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
key	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
l2tp	l2tp_eth: fix memory allocation	2010-04-23 16:37:33 -07:00
lapb	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
llc	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
mac80211	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
netfilter	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
netlabel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-06 08:34:06 -07:00
netlink	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
netrom	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
packet	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-21 01:14:25 -07:00
phonet	phonet: use phonet_pernet instead of directly net_generic	2010-04-26 11:18:44 -07:00
rds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-27 12:49:13 -07:00
rfkill	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
rose	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
rxrpc	net: use sk_sleep()	2010-04-26 11:18:45 -07:00
sched	net: Fix various endianness glitches	2010-04-20 19:06:52 -07:00
sctp	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
sunrpc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-21 01:14:25 -07:00
tipc	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
unix	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
wanrouter	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
wimax	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wireless	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
x25	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-27 12:49:13 -07:00
xfrm	net: Fix various endianness glitches	2010-04-20 19:06:52 -07:00
compat.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	l2tp: Split pppol2tp patch into separate l2tp and ppp parts	2010-04-03 14:56:02 -07:00
Makefile	l2tp: Split pppol2tp patch into separate l2tp and ppp parts	2010-04-03 14:56:02 -07:00
nonet.c
socket.c	fasync: RCU and fine grained locking	2010-04-21 16:19:29 -07:00
sysctl_net.c	net: spread __net_init, __net_exit	2010-01-17 19:16:02 -08:00
TUNABLE