diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-15 17:20:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-15 17:21:25 -0700 |
| commit | 5d1321a9fca29987c93c6d95c06d8f04e6468835 (patch) | |
| tree | 5788ca9462bd19edcef33f2bdff2546cd350399a /net/ipv4 | |
| parent | 7324157b8af19ff797b550b7b1543aa1c9c07b48 (diff) | |
| parent | 394f51abb3d04f33fb798f04b16ae6b0491ea4ec (diff) | |
| download | linux-5d1321a9fca29987c93c6d95c06d8f04e6468835.tar.bz2 | |
Merge branch 'getroute-no-rtnl'
Florian Westphal says:
====================
ipv4 getroute doesn't assume rtnl lock is held anymore, also make
this true for ipv6, then switch both to DOIT_UNLOCKED.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 6810d2076b1b..618bbe1405fc 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -3073,7 +3073,8 @@ int __init ip_rt_init(void) xfrm_init(); xfrm4_init(); #endif - rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL, 0); + rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL, + RTNL_FLAG_DOIT_UNLOCKED); #ifdef CONFIG_SYSCTL register_pernet_subsys(&sysctl_route_ops); |