From e39e7ed9b8f686393c80d31c25e0bb8053b98733 Mon Sep 17 00:00:00 2001 From: Changli Gao Date: Sat, 31 Jul 2010 13:25:08 +0000 Subject: [PATCH] --- yaml --- r: 204022 b: refs/heads/master c: c893b8066c7bf6156e4d760e5acaf4c148e37190 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a17e62df9ab5..57c03afde6f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c0fef0b7d36e5f8d3ea3731a8228102274e3c23 +refs/heads/master: c893b8066c7bf6156e4d760e5acaf4c148e37190 diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index 6652bd9da676..04b69896df5f 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -446,7 +446,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) int ptr; struct net_device *dev; struct sk_buff *skb2; - unsigned int mtu, hlen, left, len, ll_rs, pad; + unsigned int mtu, hlen, left, len, ll_rs; int offset; __be16 not_last_frag; struct rtable *rt = skb_rtable(skb); @@ -585,9 +585,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) /* for bridged IP traffic encapsulated inside f.e. a vlan header, * we need to make room for the encapsulating header */ - pad = nf_bridge_pad(skb); - ll_rs = LL_RESERVED_SPACE_EXTRA(rt->dst.dev, pad); - mtu -= pad; + ll_rs = LL_RESERVED_SPACE_EXTRA(rt->dst.dev, nf_bridge_pad(skb)); /* * Fragment the datagram.