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