2 files changed, 11 insertions, 9 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 744af67a5989..181b70ebd964 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -426,13 +426,15 @@ void tcp_init_sock(struct sock *sk)
 }
 EXPORT_SYMBOL(tcp_init_sock);
 
-void tcp_tx_timestamp(struct sock *sk, struct sk_buff *skb)
+static void tcp_tx_timestamp(struct sock *sk, struct sk_buff *skb)
 {
-        struct skb_shared_info *shinfo = skb_shinfo(skb);
+        if (sk->sk_tsflags) {
+                struct skb_shared_info *shinfo = skb_shinfo(skb);
 
-        sock_tx_timestamp(sk, &shinfo->tx_flags);
-        if (shinfo->tx_flags & SKBTX_ANY_SW_TSTAMP)
-                shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1;
+                sock_tx_timestamp(sk, &shinfo->tx_flags);
+                if (shinfo->tx_flags & SKBTX_ANY_TSTAMP)
+                        shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1;
+        }
 }
 
 /*
diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c
index f597119fc4e7..bc1b83cb8309 100644
--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
@@ -14,12 +14,12 @@
 #include <net/tcp.h>
 #include <net/protocol.h>
 
-void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, unsigned int seq,
-                    unsigned int mss)
+static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq,
+                           unsigned int seq, unsigned int mss)
 {
         while (skb) {
-                if (ts_seq < (__u64) seq + mss) {
-                        skb_shinfo(skb)->tx_flags = SKBTX_SW_TSTAMP;
+                if (before(ts_seq, seq + mss)) {
+                        skb_shinfo(skb)->tx_flags |= SKBTX_SW_TSTAMP;
                         skb_shinfo(skb)->tskey = ts_seq;
                         return;
                 }