From 66087078d61b6fdc7b75d8cf875f856c2f8d4bc8 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 18 Nov 2011 02:20:06 +0000 Subject: [PATCH] --- yaml --- r: 277902 b: refs/heads/master c: 805dc1d60fb0d4a8b7730748a11dc2688b8f6cf6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_gre.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6fc401b0de51..d06faff028ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ce4091256d61f8e9c7296f6643c8bd5bb2a00e5 +refs/heads/master: 805dc1d60fb0d4a8b7730748a11dc2688b8f6cf6 diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c index 38f7c07d12ab..2b32296b7958 100644 --- a/trunk/net/ipv4/ip_gre.c +++ b/trunk/net/ipv4/ip_gre.c @@ -835,6 +835,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev 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); dev->stats.tx_dropped++;