From: David S. Miller <davem@davemloft.net>
Date: Sat, 6 Sep 2014 00:49:39 +0000 (-0700)
Subject: Merge branch 'tcp'
X-Git-Tag: fixes-against-v3.18-rc2~81^2~148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aff50170a37d032c86d10c1815e875e8af0aa1a;p=pandora-kernel.git

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>
---

3aff50170a37d032c86d10c1815e875e8af0aa1a
Reading git-diff-tree failed