diff options
author | Florian Westphal <fw@strlen.de> | 2017-03-07 06:45:04 -0500 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-03-08 13:01:23 -0500 |
commit | efc9b8e33b8b5ef890288758454ce62a1319c94a (patch) | |
tree | 9eee158b2ccf44e4e9c52f3166dd843d673048bc /net/bridge | |
parent | c7a72e3fdb5d77486ca3a0ac942c0a2e0d80d5bb (diff) |
netfilter: bridge: remove unneeded rcu_read_lock
as comment says, the function is always called with rcu read lock held.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netfilter_hooks.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c index 95087e6e8258..52739e6c610e 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c | |||
@@ -1016,13 +1016,10 @@ int br_nf_hook_thresh(unsigned int hook, struct net *net, | |||
1016 | if (!elem) | 1016 | if (!elem) |
1017 | return okfn(net, sk, skb); | 1017 | return okfn(net, sk, skb); |
1018 | 1018 | ||
1019 | /* We may already have this, but read-locks nest anyway */ | ||
1020 | rcu_read_lock(); | ||
1021 | nf_hook_state_init(&state, hook, NFPROTO_BRIDGE, indev, outdev, | 1019 | nf_hook_state_init(&state, hook, NFPROTO_BRIDGE, indev, outdev, |
1022 | sk, net, okfn); | 1020 | sk, net, okfn); |
1023 | 1021 | ||
1024 | ret = nf_hook_slow(skb, &state, elem); | 1022 | ret = nf_hook_slow(skb, &state, elem); |
1025 | rcu_read_unlock(); | ||
1026 | if (ret == 1) | 1023 | if (ret == 1) |
1027 | ret = okfn(net, sk, skb); | 1024 | ret = okfn(net, sk, skb); |
1028 | 1025 | ||