1 files changed, 12 insertions, 7 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 5b6690d05abb..a85a8c2948e5 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -991,6 +991,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
         struct tcp_skb_cb *tcb;
         struct tcp_out_options opts;
         unsigned int tcp_options_size, tcp_header_size;
+        struct sk_buff *oskb = NULL;
         struct tcp_md5sig_key *md5;
         struct tcphdr *th;
         int err;
@@ -998,12 +999,12 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
         BUG_ON(!skb || !tcp_skb_pcount(skb));
         tp = tcp_sk(sk);
 
-        skb->skb_mstamp = tp->tcp_mstamp;
         if (clone_it) {
                 TCP_SKB_CB(skb)->tx.in_flight = TCP_SKB_CB(skb)->end_seq
                         - tp->snd_una;
                 tcp_rate_skb_sent(sk, skb);
 
+                oskb = skb;
                 if (unlikely(skb_cloned(skb)))
                         skb = pskb_copy(skb, gfp_mask);
                 else
@@ -1011,6 +1012,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
                 if (unlikely(!skb))
                         return -ENOBUFS;
         }
+        skb->skb_mstamp = tp->tcp_mstamp;
 
         inet = inet_sk(sk);
         tcb = TCP_SKB_CB(skb);
@@ -1122,12 +1124,14 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
 
         err = icsk->icsk_af_ops->queue_xmit(sk, skb, &inet->cork.fl);
 
-        if (likely(err <= 0))
-                return err;
-
-        tcp_enter_cwr(sk);
+        if (unlikely(err > 0)) {
+                tcp_enter_cwr(sk);
+                err = net_xmit_eval(err);
+        }
+        if (!err && oskb)
+                oskb->skb_mstamp = tp->tcp_mstamp;
 
-        return net_xmit_eval(err);
+        return err;
 }
 
 /* This routine just queues the buffer for sending.
@@ -2869,10 +2873,11 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
                      skb_headroom(skb) >= 0xFFFF)) {
                 struct sk_buff *nskb;
 
-                skb->skb_mstamp = tp->tcp_mstamp;
                 nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
                 err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
                              -ENOBUFS;
+                if (!err)
+                        skb->skb_mstamp = tp->tcp_mstamp;
         } else {
                 err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
         }