diff --git a/[refs] b/[refs] index 25260ad88ac5..9b62c1941a30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79fba9f51755c704c0a7d7b7f0df10874dc0a744 +refs/heads/master: 617c8c11236716dcbda877e764b7bf37c6fd8063 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 0e501714d47f..b534a1be540a 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -1896,8 +1896,6 @@ static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom, { int delta = 0; - if (headroom < NET_SKB_PAD) - headroom = NET_SKB_PAD; if (headroom > skb_headroom(skb)) delta = headroom - skb_headroom(skb);