diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
| commit | b05930f5d1c7d5873cb050261d21789a99de9d48 (patch) | |
| tree | 2d374846712b0bdacc5dd0a36b3c2f754886e560 /net/ipv4 | |
| parent | b65f63ee845136940db985f3072335d8cdb6fd6c (diff) | |
| parent | 41a00f7950a6bc0aa956f6d6b423f0fbf34d431a (diff) | |
| download | linux-b05930f5d1c7d5873cb050261d21789a99de9d48.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index ab64eea042fa..4e42c03859f4 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1117,6 +1117,13 @@ new_segment: goto wait_for_memory; /* + * All packets are restored as if they have + * already been sent. + */ + if (tp->repair) + TCP_SKB_CB(skb)->when = tcp_time_stamp; + + /* * Check whether we can use HW checksum. */ if (sk->sk_route_caps & NETIF_F_ALL_CSUM) |