bridge: move mac header copying into br_netfilter
authorFlorian Westphal <fw@strlen.de>
Wed, 4 Mar 2015 23:52:33 +0000 (00:52 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 9 Mar 2015 12:20:48 +0000 (13:20 +0100)
The mac header only has to be copied back into the skb for
fragments generated by ip_fragment(), which only happens
for bridge forwarded packets with nf-call-iptables=1 && active nf_defrag.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/netfilter_bridge.h
net/bridge/br_forward.c
net/bridge/br_netfilter.c

Simple merge
Simple merge
Simple merge