diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-11-27 21:55:14 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-08 18:01:23 +0100 |
| commit | ef71fe27ec2f1607e38af160ab261a8d8ef8e121 (patch) | |
| tree | a1ca3ce2d168dc58db17fd0c4f1beefe36685f0c /net/bridge | |
| parent | 625c556118f3c2fd28bb8ef6da18c53bd4037be4 (diff) | |
| download | linux-ef71fe27ec2f1607e38af160ab261a8d8ef8e121.tar.gz linux-ef71fe27ec2f1607e38af160ab261a8d8ef8e121.tar.bz2 linux-ef71fe27ec2f1607e38af160ab261a8d8ef8e121.zip | |
netfilter: move checksum indirection to struct nf_ipv6_ops
We cannot make a direct call to nf_ip6_checksum() because that would
result in autoloading the 'ipv6' module because of symbol dependencies.
Therefore, define checksum 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 <pablo@netfilter.org>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/nf_tables_bridge.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/bridge/netfilter/nf_tables_bridge.c b/net/bridge/netfilter/nf_tables_bridge.c index 74260ffec74d..b850c17f02f5 100644 --- a/net/bridge/netfilter/nf_tables_bridge.c +++ b/net/bridge/netfilter/nf_tables_bridge.c @@ -106,12 +106,6 @@ static int nf_br_reroute(struct net *net, struct sk_buff *skb, return 0; } -static __sum16 nf_br_checksum(struct sk_buff *skb, unsigned int hook, - unsigned int dataoff, u_int8_t protocol) -{ - return 0; -} - static __sum16 nf_br_checksum_partial(struct sk_buff *skb, unsigned int hook, unsigned int dataoff, unsigned int len, u_int8_t protocol) @@ -127,7 +121,6 @@ static int nf_br_route(struct net *net, struct dst_entry **dst, static const struct nf_afinfo nf_br_afinfo = { .family = AF_BRIDGE, - .checksum = nf_br_checksum, .checksum_partial = nf_br_checksum_partial, .route = nf_br_route, .saveroute = nf_br_saveroute, |