aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/igmp.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-12-16 16:45:43 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:58:15 -0500
commitf97c1e0c6ebdb606c97b6cb5e837c6110ac5a961 (patch)
tree2af3da0114614a127099f9ab2ef706f676faa376 /net/ipv4/igmp.c
parent21cf2253ebcf070bc307e0b56d696a2519c75cb4 (diff)
[IPV4] net/ipv4: Use ipv4_is_<type>
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r--net/ipv4/igmp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index d3d5906e1b3d..285d26218a51 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1742,7 +1742,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
1742 int ifindex; 1742 int ifindex;
1743 int count = 0; 1743 int count = 0;
1744 1744
1745 if (!MULTICAST(addr)) 1745 if (!ipv4_is_multicast(addr))
1746 return -EINVAL; 1746 return -EINVAL;
1747 1747
1748 rtnl_lock(); 1748 rtnl_lock();
@@ -1855,7 +1855,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
1855 int leavegroup = 0; 1855 int leavegroup = 0;
1856 int i, j, rv; 1856 int i, j, rv;
1857 1857
1858 if (!MULTICAST(addr)) 1858 if (!ipv4_is_multicast(addr))
1859 return -EINVAL; 1859 return -EINVAL;
1860 1860
1861 rtnl_lock(); 1861 rtnl_lock();
@@ -1985,7 +1985,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
1985 struct ip_sf_socklist *newpsl, *psl; 1985 struct ip_sf_socklist *newpsl, *psl;
1986 int leavegroup = 0; 1986 int leavegroup = 0;
1987 1987
1988 if (!MULTICAST(addr)) 1988 if (!ipv4_is_multicast(addr))
1989 return -EINVAL; 1989 return -EINVAL;
1990 if (msf->imsf_fmode != MCAST_INCLUDE && 1990 if (msf->imsf_fmode != MCAST_INCLUDE &&
1991 msf->imsf_fmode != MCAST_EXCLUDE) 1991 msf->imsf_fmode != MCAST_EXCLUDE)
@@ -2068,7 +2068,7 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
2068 struct inet_sock *inet = inet_sk(sk); 2068 struct inet_sock *inet = inet_sk(sk);
2069 struct ip_sf_socklist *psl; 2069 struct ip_sf_socklist *psl;
2070 2070
2071 if (!MULTICAST(addr)) 2071 if (!ipv4_is_multicast(addr))
2072 return -EINVAL; 2072 return -EINVAL;
2073 2073
2074 rtnl_lock(); 2074 rtnl_lock();
@@ -2130,7 +2130,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
2130 if (psin->sin_family != AF_INET) 2130 if (psin->sin_family != AF_INET)
2131 return -EINVAL; 2131 return -EINVAL;
2132 addr = psin->sin_addr.s_addr; 2132 addr = psin->sin_addr.s_addr;
2133 if (!MULTICAST(addr)) 2133 if (!ipv4_is_multicast(addr))
2134 return -EINVAL; 2134 return -EINVAL;
2135 2135
2136 rtnl_lock(); 2136 rtnl_lock();
@@ -2180,7 +2180,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
2180 struct ip_sf_socklist *psl; 2180 struct ip_sf_socklist *psl;
2181 int i; 2181 int i;
2182 2182
2183 if (!MULTICAST(loc_addr)) 2183 if (!ipv4_is_multicast(loc_addr))
2184 return 1; 2184 return 1;
2185 2185
2186 for (pmc=inet->mc_list; pmc; pmc=pmc->next) { 2186 for (pmc=inet->mc_list; pmc; pmc=pmc->next) {