diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-04-21 08:05:41 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-04-21 08:05:41 +0000 |
| commit | e79c2b3d99cd36cc85cf1a4acb2f9ac86ce10620 (patch) | |
| tree | 20e184815b3ee3d52ac372c71b30df7693c9bdcc /main/linux-pae/ip_gre2.patch | |
| parent | 8afe163ae82ebf7594308b3dfe4bc76fdcbdb97f (diff) | |
| download | aports-e79c2b3d99cd36cc85cf1a4acb2f9ac86ce10620.tar.bz2 aports-e79c2b3d99cd36cc85cf1a4acb2f9ac86ce10620.tar.xz | |
main/linux-pae: sync with main/linux-grsec
Diffstat (limited to 'main/linux-pae/ip_gre2.patch')
| -rw-r--r-- | main/linux-pae/ip_gre2.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/main/linux-pae/ip_gre2.patch b/main/linux-pae/ip_gre2.patch deleted file mode 100644 index 52c44076..00000000 --- a/main/linux-pae/ip_gre2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- linux-2.6.32/net/ipv4/ip_gre.c.orig -+++ linux-2.6.32/net/ipv4/ip_gre.c -@@ -803,11 +803,13 @@ - tunnel->err_count = 0; - } - -- max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen; -+ max_headroom = LL_RESERVED_SPACE(tdev) + gre_hlen + rt->u.dst.header_len; - - if (skb_headroom(skb) < max_headroom || skb_shared(skb)|| - (skb_cloned(skb) && !skb_clone_writable(skb, 0))) { - struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); -+ if (max_headroom > dev->needed_headroom) -+ dev->needed_headroom = max_headroom; - if (!new_skb) { - ip_rt_put(rt); - stats->tx_dropped++; |