summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-09-26 13:58:43 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-28 10:20:49 -0700
commit4c82a95e523721637d44e0e8d879fa11fa825eec (patch)
tree7a2cca0d9ef31ffedfaf3b3ba8f61a969694228a /net
parentb1e66b9a67d67d0e73091b04b51e524581c8c887 (diff)
downloadlinux-stable-4c82a95e523721637d44e0e8d879fa11fa825eec.tar.gz
linux-stable-4c82a95e523721637d44e0e8d879fa11fa825eec.tar.bz2
linux-stable-4c82a95e523721637d44e0e8d879fa11fa825eec.zip
rtnetlink: rtnl_have_link_slave_info doesn't need rtnl
it can be switched to rcu. Reviewed-by: David Ahern <dsahern@gmail.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/rtnetlink.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d524609c587c..e6955da0d58d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -522,11 +522,15 @@ static size_t rtnl_link_get_af_size(const struct net_device *dev,
static bool rtnl_have_link_slave_info(const struct net_device *dev)
{
struct net_device *master_dev;
+ bool ret = false;
- master_dev = netdev_master_upper_dev_get((struct net_device *) dev);
+ rcu_read_lock();
+
+ master_dev = netdev_master_upper_dev_get_rcu((struct net_device *)dev);
if (master_dev && master_dev->rtnl_link_ops)
- return true;
- return false;
+ ret = true;
+ rcu_read_unlock();
+ return ret;
}
static int rtnl_link_slave_info_fill(struct sk_buff *skb,