summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6mr.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2022-02-21 11:33:57 +0100
committerThomas Gleixner <tglx@linutronix.de>2022-02-21 11:33:57 +0100
commitd2206fcabdfaff3958ab67cc5b8f63257e57b889 (patch)
treef6bc697bb2d10e49e5123b4e0cc30c11aafc3120 /net/ipv6/ip6mr.c
parentfe13889c390e14205e064d7e159e61eb5da4b1c3 (diff)
parent509853f9e1e7b1490dc79f735a5dbafc9298f40d (diff)
downloadlinux-d2206fcabdfaff3958ab67cc5b8f63257e57b889.tar.bz2
Merge tag 'irq-api-2022-02-21' into irq/core
Merge the generic_handle_irq_safe() API back into irq/core.
Diffstat (limited to 'net/ipv6/ip6mr.c')
-rw-r--r--net/ipv6/ip6mr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 7cf73e60e619..8a2db926b5eb 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -243,7 +243,9 @@ static int __net_init ip6mr_rules_init(struct net *net)
return 0;
err2:
+ rtnl_lock();
ip6mr_free_table(mrt);
+ rtnl_unlock();
err1:
fib_rules_unregister(ops);
return err;