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 | 51bc47ce7cf79f39437f65411a7f0c5a316c9a28 (patch) | |
| tree | b85aae75cef78c7b3e9449b0c6b4aa53dcb70859 /target/linux/generic/patches-3.3 | |
| parent | 0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c (diff) | |
| download | master-31e0f0ae-51bc47ce7cf79f39437f65411a7f0c5a316c9a28.tar.gz master-31e0f0ae-51bc47ce7cf79f39437f65411a7f0c5a316c9a28.tar.bz2 master-31e0f0ae-51bc47ce7cf79f39437f65411a7f0c5a316c9a28.zip | |
kernel: properly pad the allocated headroom in skb_cow to NET_SKB_PAD
SVN-Revision: 31906
Diffstat (limited to 'target/linux/generic/patches-3.3')
| -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) |