aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.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/ipmr.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/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 9947f523862e..772daf77878f 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -749,7 +749,7 @@ static int ipmr_mfc_add(struct mfcctl *mfc, int mrtsock)
749 return 0; 749 return 0;
750 } 750 }
751 751
752 if (!MULTICAST(mfc->mfcc_mcastgrp.s_addr)) 752 if (!ipv4_is_multicast(mfc->mfcc_mcastgrp.s_addr))
753 return -EINVAL; 753 return -EINVAL;
754 754
755 c=ipmr_cache_alloc(); 755 c=ipmr_cache_alloc();
@@ -1461,7 +1461,7 @@ int pim_rcv_v1(struct sk_buff * skb)
1461 b. packet is not a NULL-REGISTER 1461 b. packet is not a NULL-REGISTER
1462 c. packet is not truncated 1462 c. packet is not truncated
1463 */ 1463 */
1464 if (!MULTICAST(encap->daddr) || 1464 if (!ipv4_is_multicast(encap->daddr) ||
1465 encap->tot_len == 0 || 1465 encap->tot_len == 0 ||
1466 ntohs(encap->tot_len) + sizeof(*pim) > skb->len) 1466 ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
1467 goto drop; 1467 goto drop;
@@ -1517,7 +1517,7 @@ static int pim_rcv(struct sk_buff * skb)
1517 /* check if the inner packet is destined to mcast group */ 1517 /* check if the inner packet is destined to mcast group */
1518 encap = (struct iphdr *)(skb_transport_header(skb) + 1518 encap = (struct iphdr *)(skb_transport_header(skb) +
1519 sizeof(struct pimreghdr)); 1519 sizeof(struct pimreghdr));
1520 if (!MULTICAST(encap->daddr) || 1520 if (!ipv4_is_multicast(encap->daddr) ||
1521 encap->tot_len == 0 || 1521 encap->tot_len == 0 ||
1522 ntohs(encap->tot_len) + sizeof(*pim) > skb->len) 1522 ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
1523 goto drop; 1523 goto drop;