diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-11 03:34:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-11 03:37:26 +0300 |
| commit | dbdd9a52e38a4a93adfa4d0278801cce4fad98eb (patch) | |
| tree | a223ba84f33976b0d2c17d3177cbe976a3c948fc /net/ipv4/route.c | |
| parent | 33175d84ee3fa29991adb80513683e010769e807 (diff) | |
| download | linux-dbdd9a52e38a4a93adfa4d0278801cce4fad98eb.tar.xz | |
ipv4: Remove redundant RCU locking in ip_check_mc().
All callers are under rcu_read_lock() protection already.
Rename to ip_check_mc_rcu() to make it even more clear.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index ac32d8f3d68f..f6730d94e307 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2309,8 +2309,8 @@ skip_cache: struct in_device *in_dev = __in_dev_get_rcu(dev); if (in_dev) { - int our = ip_check_mc(in_dev, daddr, saddr, - ip_hdr(skb)->protocol); + int our = ip_check_mc_rcu(in_dev, daddr, saddr, + ip_hdr(skb)->protocol); if (our #ifdef CONFIG_IP_MROUTE || @@ -2368,8 +2368,8 @@ static struct rtable *__mkroute_output(const struct fib_result *res, fi = NULL; } else if (type == RTN_MULTICAST) { flags |= RTCF_MULTICAST | RTCF_LOCAL; - if (!ip_check_mc(in_dev, oldflp->fl4_dst, oldflp->fl4_src, - oldflp->proto)) + if (!ip_check_mc_rcu(in_dev, oldflp->fl4_dst, oldflp->fl4_src, + oldflp->proto)) flags &= ~RTCF_LOCAL; /* If multicast route do not exist use * default one, but do not gateway in this case. |