diff options
| author |   Florian Westphal <fw@strlen.de> | 2018-12-18 17:15:17 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-19 11:21:37 -0800 |
| commit | de8bda1d22d38b7d5cd08b33f86efd94d4c86630 (patch) | |
| tree | 7acdf2397b31eb8b1601c9183ef30b8ebbe8400a /net/bridge/br_netfilter_ipv6.c | |
| parent | sk_buff: add skb extension infrastructure (diff) | |
| download | wireguard-linux-de8bda1d22d38b7d5cd08b33f86efd94d4c86630.tar.xz wireguard-linux-de8bda1d22d38b7d5cd08b33f86efd94d4c86630.zip | |
net: convert bridge_nf to use skb extension infrastructure
This converts the bridge netfilter (calling iptables hooks from bridge)
facility to use the extension infrastructure.
The bridge_nf specific hooks in skb clone and free paths are removed, they
have been replaced by the skb_ext hooks that do the same as the bridge nf
allocations hooks did.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_netfilter_ipv6.c')
| -rw-r--r-- | net/bridge/br_netfilter_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c index 96c072e71ea2..94039f588f1d 100644 --- a/net/bridge/br_netfilter_ipv6.c +++ b/net/bridge/br_netfilter_ipv6.c @@ -224,8 +224,8 @@ unsigned int br_nf_pre_routing_ipv6(void *priv, if (br_validate_ipv6(state->net, skb)) return NF_DROP; - nf_bridge_put(skb->nf_bridge); - if (!nf_bridge_alloc(skb)) + nf_bridge = nf_bridge_alloc(skb); + if (!nf_bridge) return NF_DROP; if (!setup_pre_routing(skb)) return NF_DROP; |