aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-pae/ip_gre2.patch
blob: 52c44076d22a7953e7bd06e42aedd0aabd15983c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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++;