diff options
| author | Michael Mason <ms13sp@gmail.com> | 2010-03-17 17:43:41 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2010-03-17 17:43:41 +0000 |
| commit | 4b23d4dfa33b09440ffbdfccbd46571649ccecaa (patch) | |
| tree | 02c3b507f3e038c1e191fa97d59562b468e64b65 /main/linux-grsec/ip_gre2.patch | |
| parent | e59a787cc0775b8f7f97d492674a257baef45f6d (diff) | |
| parent | 192b8fad759488bbe2fea1b43acda638eb6ebe85 (diff) | |
| download | aports-4b23d4dfa33b09440ffbdfccbd46571649ccecaa.tar.bz2 aports-4b23d4dfa33b09440ffbdfccbd46571649ccecaa.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/linux-grsec/ip_gre2.patch')
| -rw-r--r-- | main/linux-grsec/ip_gre2.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/main/linux-grsec/ip_gre2.patch b/main/linux-grsec/ip_gre2.patch new file mode 100644 index 0000000000..52c44076d2 --- /dev/null +++ b/main/linux-grsec/ip_gre2.patch @@ -0,0 +1,17 @@ +--- 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++; |