From 95d801c59d18de6b463d1b815180cd85ad3ca95a Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 27 May 2012 15:16:37 +0000 Subject: kernel: properly pad the allocated headroom in skb_cow to NET_SKB_PAD git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31906 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch b/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch index dfa98198ed..5b2537127f 100644 --- a/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch +++ b/target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch @@ -10,10 +10,11 @@ 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 = headroom - skb_headroom(skb); ++ delta = alloc_headroom - skb_headroom(skb); + } if (delta || cloned) -- cgit v1.2.3