mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-23 14:59:54 +02:00
95d801c59d
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31906 3c298f89-4303-0410-b956-a3cf2f4a3e73
22 lines
679 B
Diff
22 lines
679 B
Diff
--- a/include/linux/skbuff.h
|
|
+++ b/include/linux/skbuff.h
|
|
@@ -1850,12 +1850,15 @@ static inline int skb_clone_writable(con
|
|
static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
|
|
int cloned)
|
|
{
|
|
+ unsigned int alloc_headroom = headroom;
|
|
int delta = 0;
|
|
|
|
if (headroom < NET_SKB_PAD)
|
|
- headroom = NET_SKB_PAD;
|
|
- if (headroom > skb_headroom(skb))
|
|
- delta = headroom - skb_headroom(skb);
|
|
+ alloc_headroom = NET_SKB_PAD;
|
|
+ if (headroom > skb_headroom(skb) ||
|
|
+ (cloned && alloc_headroom > skb_headroom(skb))) {
|
|
+ delta = alloc_headroom - skb_headroom(skb);
|
|
+ }
|
|
|
|
if (delta || cloned)
|
|
return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
|