Commit d9bf82c2 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

ipv6: ipv6_count_addresses() rcu conversion

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ef802aa
...@@ -152,7 +152,7 @@ static void ipv6_regen_rndid(struct inet6_dev *idev); ...@@ -152,7 +152,7 @@ static void ipv6_regen_rndid(struct inet6_dev *idev);
static void ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr); static void ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr);
static int ipv6_generate_eui64(u8 *eui, struct net_device *dev); static int ipv6_generate_eui64(u8 *eui, struct net_device *dev);
static int ipv6_count_addresses(struct inet6_dev *idev); static int ipv6_count_addresses(const struct inet6_dev *idev);
static int ipv6_generate_stable_address(struct in6_addr *addr, static int ipv6_generate_stable_address(struct in6_addr *addr,
u8 dad_count, u8 dad_count,
const struct inet6_dev *idev); const struct inet6_dev *idev);
...@@ -1785,15 +1785,15 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, ...@@ -1785,15 +1785,15 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
return err; return err;
} }
static int ipv6_count_addresses(struct inet6_dev *idev) static int ipv6_count_addresses(const struct inet6_dev *idev)
{ {
const struct inet6_ifaddr *ifp;
int cnt = 0; int cnt = 0;
struct inet6_ifaddr *ifp;
read_lock_bh(&idev->lock); rcu_read_lock();
list_for_each_entry(ifp, &idev->addr_list, if_list) list_for_each_entry_rcu(ifp, &idev->addr_list, if_list)
cnt++; cnt++;
read_unlock_bh(&idev->lock); rcu_read_unlock();
return cnt; return cnt;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment