From: Kuniyuki Iwashima Date: Wed, 15 Jan 2025 08:05:58 +0000 (+0900) Subject: ipv6: Add __in6_dev_get_rtnl_net(). X-Git-Tag: v6.14-rc1~162^2~3^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7a6082b5e4c15f34fd766cf0960f7e082009c54;p=thirdparty%2Fkernel%2Flinux.git ipv6: Add __in6_dev_get_rtnl_net(). We will convert rtnl_lock() with rtnl_net_lock(), and we want to convert __in6_dev_get() too. __in6_dev_get() uses rcu_dereference_rtnl(), but as written in its comment, rtnl_dereference() or rcu_dereference() is preferable. Let's add __in6_dev_get_rtnl_net() that uses rtnl_net_dereference(). We can add the RCU version helper later if needed. Signed-off-by: Kuniyuki Iwashima Link: https://patch.msgid.link/20250115080608.28127-2-kuniyu@amazon.com Signed-off-by: Jakub Kicinski --- diff --git a/include/net/addrconf.h b/include/net/addrconf.h index f8f91b2038eaf..9e5e95988b9e5 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -347,6 +347,11 @@ static inline struct inet6_dev *__in6_dev_get(const struct net_device *dev) return rcu_dereference_rtnl(dev->ip6_ptr); } +static inline struct inet6_dev *__in6_dev_get_rtnl_net(const struct net_device *dev) +{ + return rtnl_net_dereference(dev_net(dev), dev->ip6_ptr); +} + /** * __in6_dev_stats_get - get inet6_dev pointer for stats * @dev: network device