diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-05-27 15:16:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-05-27 15:16:37 +0000 |
| commit | 260e2d84866dfbbd30079da950e0a947e91fe905 (patch) | |
| tree | ed811fadf71d0924263634767fd26d939d0621cd /target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch | |
| parent | 4f1451b47e0483c21393b13f82d5eb24d3fb17f2 (diff) | |
| download | master-187ad058-260e2d84866dfbbd30079da950e0a947e91fe905.tar.gz master-187ad058-260e2d84866dfbbd30079da950e0a947e91fe905.tar.bz2 master-187ad058-260e2d84866dfbbd30079da950e0a947e91fe905.zip | |
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
Diffstat (limited to 'target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/654-avoid_skb_cow_realloc.patch | 3 |
1 files changed, 2 insertions, 1 deletions
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) |