ip_gre: Set needed_headroom dynamically again
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 18 Nov 2011 02:20:06 +0000 (02:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Nov 2011 19:37:10 +0000 (14:37 -0500)
ip_gre: Set needed_headroom dynamically again

Now that all needed_headroom users have been fixed up so that
we can safely increase needed_headroom, this patch restore the
dynamic update of needed_headroom.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_gre.c

index 38f7c07d12ab632b538626ea6226bf8267b1e643..2b32296b7958fc8ac03b64e30f4ed8bfa3c77f0a 100644 (file)
@@ -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++;