Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / ipv4 / igmp.c

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 85107bf812f228ae34e767b2e440aec4776fbe6c..180f6896b98baade47bf9e2a4b208043fbc6cca3 100644 (file)
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -332,14 +332,15 @@ static __be32 igmpv3_get_srcaddr(struct net_device *dev,
                                 const struct flowi4 *fl4)
 {
        struct in_device *in_dev = __in_dev_get_rcu(dev);
+       const struct in_ifaddr *ifa;
 
        if (!in_dev)
                return htonl(INADDR_ANY);
 
-       for_ifa(in_dev) {
+       in_dev_for_each_ifa_rcu(ifa, in_dev) {
                if (fl4->saddr == ifa->ifa_local)
                        return fl4->saddr;
-       } endfor_ifa(in_dev);
+       }
 
        return htonl(INADDR_ANY);
 }