1 files changed, 9 insertions, 6 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 50788d67bdb7..8c8de2780c7a 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1093,6 +1093,13 @@ static void __pskb_trim_head(struct sk_buff *skb, int len)
 {
         int i, k, eat;
 
+        eat = min_t(int, len, skb_headlen(skb));
+        if (eat) {
+                __skb_pull(skb, eat);
+                len -= eat;
+                if (!len)
+                        return;
+        }
         eat = len;
         k = 0;
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
@@ -1124,11 +1131,7 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
         if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                 return -ENOMEM;
 
-        /* If len == headlen, we avoid __skb_pull to preserve alignment. */
-        if (unlikely(len < skb_headlen(skb)))
-                __skb_pull(skb, len);
-        else
-                __pskb_trim_head(skb, len - skb_headlen(skb));
+        __pskb_trim_head(skb, len);
 
         TCP_SKB_CB(skb)->seq += len;
         skb->ip_summed = CHECKSUM_PARTIAL;
@@ -1919,7 +1922,7 @@ u32 __tcp_select_window(struct sock *sk)
         if (free_space < (full_space >> 1)) {
                 icsk->icsk_ack.quick = 0;
 
-                if (tcp_memory_pressure)
+                if (sk_under_memory_pressure(sk))
                         tp->rcv_ssthresh = min(tp->rcv_ssthresh,
                                                4U * tp->advmss);