netfilter: move reroute indirection to struct nf_ipv6_ops

We cannot make a direct call to nf_ip6_reroute() because that would result
in autoloading the 'ipv6' module because of symbol dependencies.
Therefore, define reroute indirection in nf_ipv6_ops where this really
belongs to.

For IPv4, we can indeed make a direct function call, which is faster,
given IPv4 is built-in in the networking code by default. Still,
CONFIG_INET=n and CONFIG_NETFILTER=y is possible, so define empty inline
stub for IPv4 in such case.

Signed-off-by: Pablo Neira Ayuso <[email protected]>
This commit is contained in:
Pablo Neira Ayuso 2017-11-27 22:50:26 +01:00
commit ce388f452f
8 changed files with 39 additions and 19 deletions

View file

@ -95,15 +95,8 @@ static const struct nf_chain_type filter_bridge = {
},
};
static int nf_br_reroute(struct net *net, struct sk_buff *skb,
const struct nf_queue_entry *entry)
{
return 0;
}
static const struct nf_afinfo nf_br_afinfo = {
.family = AF_BRIDGE,
.reroute = nf_br_reroute,
.route_key_size = 0,
};