summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-03-20 02:27:58 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-21 21:23:28 -0700
commit243aad830e8a4cdda261626fbaeddde16b08d04a (patch)
tree3c8de91b5249846dede05c1a3a74387e0eda0470 /net/ipv4
parent9bf35c8dddd56f7f247a27346f74f5adc18071f4 (diff)
downloadop-kernel-dev-243aad830e8a4cdda261626fbaeddde16b08d04a.zip
op-kernel-dev-243aad830e8a4cdda261626fbaeddde16b08d04a.tar.gz
ip_gre: include route header_len in max_headroom calculation
Taking route's header_len into account, and updating gre device needed_headroom will give better hints on upper bound of required headroom. This is useful if the gre traffic is xfrm'ed. Signed-off-by: Timo Teras <timo.teras@iki.fi> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f47c9f7..f78402d 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -810,11 +810,13 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
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);
txq->tx_dropped++;
OpenPOWER on IntegriCloud