summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2015-03-18 20:55:31 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2015-03-22 19:45:55 +0100
commit8d0451638ad3f7ccd5250c1dd90e06ad487b2703 (patch)
tree22e8caef37b59bbc0600e2a7dea95a733d4f385e /net/ipv4/ip_output.c
parentffdb210eb415501c289f6becafb54fe2f4535efa (diff)
downloadop-kernel-dev-8d0451638ad3f7ccd5250c1dd90e06ad487b2703.zip
op-kernel-dev-8d0451638ad3f7ccd5250c1dd90e06ad487b2703.tar.gz
netfilter: bridge: kill nf_bridge_pad
The br_netfilter frag output function calls skb_cow_head() so in case it needs a larger headroom to e.g. re-add a previously stripped PPPOE or VLAN header things will still work (at cost of reallocation). We can then move nf_bridge_encap_header_len to br_netfilter. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index a7aea20..90b49e8 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -636,10 +636,7 @@ slow_path:
left = skb->len - hlen; /* Space per frame */
ptr = hlen; /* Where to start from */
- /* for bridged IP traffic encapsulated inside f.e. a vlan header,
- * we need to make room for the encapsulating header
- */
- ll_rs = LL_RESERVED_SPACE_EXTRA(rt->dst.dev, nf_bridge_pad(skb));
+ ll_rs = LL_RESERVED_SPACE(rt->dst.dev);
/*
* Fragment the datagram.
OpenPOWER on IntegriCloud