On Tue, May 10, 2022 at 10:53:24PM +0200, Florian Westphal wrote:
> After commit
> 12b0b21dc2241 ("netfilter: conntrack: remove unconfirmed list")
> the extra local_bh disable/enable pair is no longer needed.
Squashed into original commit.
> Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
> ---
> net/netfilter/nf_conntrack_core.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
> index 0db9c5c94b5b..082a2fd8d85b 100644
> --- a/net/netfilter/nf_conntrack_core.c
> +++ b/net/netfilter/nf_conntrack_core.c
> @@ -596,7 +596,6 @@ void nf_ct_destroy(struct nf_conntrack *nfct)
> if (unlikely(nf_ct_protonum(ct) == IPPROTO_GRE))
> destroy_gre_conntrack(ct);
>
> - local_bh_disable();
> /* Expectations will have been removed in clean_from_lists,
> * except TFTP can create an expectation on the first packet,
> * before connection is in the list, so we need to clean here,
> @@ -604,8 +603,6 @@ void nf_ct_destroy(struct nf_conntrack *nfct)
> */
> nf_ct_remove_expectations(ct);
>
> - local_bh_enable();
> -
> if (ct->master)
> nf_ct_put(ct->master);
>
> --
> 2.35.1
>
