Merge branch 'tcp'

Browse source

Eric Dumazet says:

====================
tcp: deduplicate TCP_SKB_CB(skb)->when

TCP_SKB_CB(skb)->when has different meaning in output and input paths.

In output path, it contains a timestamp.
In input path, it contains an ISN, chosen by tcp_timewait_state_process()

Its usage in output path is obsolete after usec timestamping.
Lets simplify and clean this.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-09-05 17:49:39 -07:00

parent 2ba38943ba 7faee5c0d5

commit 3aff50170a

7 changed files with 36 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

include/net/tcp.h

View file

5

net/ipv4/tcp_input.c

View file

7

net/ipv4/tcp_ipv4.c

View file

2

net/ipv4/tcp_minisocks.c

View file

39

net/ipv4/tcp_output.c

View file

7

net/ipv4/tcp_timer.c

View file

4

net/ipv6/tcp_ipv6.c

View file