Merge branch 'tcp'
authorDavid S. Miller <davem@davemloft.net>
Sat, 6 Sep 2014 00:49:39 +0000 (17:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Sep 2014 00:49:39 +0000 (17:49 -0700)
commit3aff50170a37d032c86d10c1815e875e8af0aa1a
treeebaba03f755dfbe9d942fbe610ce3aecd1b0fc33
parent2ba38943ba190eb6a494262003e23187d1b40fb4
parent7faee5c0d514162853a343d93e4a0b6bb8bfec21
Merge branch 'tcp'

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>