[IPV4] net/ipv4: Use ipv4_is_<type>

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 10 deletions

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 0832f6e028b8..8b81deb8ff1f 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -176,7 +176,8 @@ static struct ip_tunnel * ipgre_tunnel_lookup(__be32 remote, __be32 local, __be3
         }
         for (t = tunnels_l[h1]; t; t = t->next) {
                 if (local == t->parms.iph.saddr ||
-                     (local == t->parms.iph.daddr && MULTICAST(local))) {
+                     (local == t->parms.iph.daddr &&
+                      ipv4_is_multicast(local))) {
                         if (t->parms.i_key == key && (t->dev->flags&IFF_UP))
                                 return t;
                 }
@@ -201,7 +202,7 @@ static struct ip_tunnel **__ipgre_bucket(struct ip_tunnel_parm *parms)
 
         if (local)
                 prio |= 1;
-        if (remote && !MULTICAST(remote)) {
+        if (remote && !ipv4_is_multicast(remote)) {
                 prio |= 2;
                 h ^= HASH(remote);
         }
@@ -367,7 +368,8 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
 
         read_lock(&ipgre_lock);
         t = ipgre_tunnel_lookup(iph->daddr, iph->saddr, (flags&GRE_KEY) ? *(((__be32*)p) + (grehlen>>2) - 1) : 0);
-        if (t == NULL || t->parms.iph.daddr == 0 || MULTICAST(t->parms.iph.daddr))
+        if (t == NULL || t->parms.iph.daddr == 0 ||
+            ipv4_is_multicast(t->parms.iph.daddr))
                 goto out;
 
         if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED)
@@ -619,7 +621,7 @@ static int ipgre_rcv(struct sk_buff *skb)
                 skb_postpull_rcsum(skb, skb_transport_header(skb), offset);
                 skb->pkt_type = PACKET_HOST;
 #ifdef CONFIG_NET_IPGRE_BROADCAST
-                if (MULTICAST(iph->daddr)) {
+                if (ipv4_is_multicast(iph->daddr)) {
                         /* Looped back packet, drop it! */
                         if (((struct rtable*)skb->dst)->fl.iif == 0)
                                 goto drop;
@@ -783,7 +785,8 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
                 struct rt6_info *rt6 = (struct rt6_info*)skb->dst;
 
                 if (rt6 && mtu < dst_mtu(skb->dst) && mtu >= IPV6_MIN_MTU) {
-                        if ((tunnel->parms.iph.daddr && !MULTICAST(tunnel->parms.iph.daddr)) ||
+                        if ((tunnel->parms.iph.daddr &&
+                             !ipv4_is_multicast(tunnel->parms.iph.daddr)) ||
                             rt6->rt6i_dst.plen == 128) {
                                 rt6->rt6i_flags |= RTF_MODIFIED;
                                 skb->dst->metrics[RTAX_MTU-1] = mtu;
@@ -1009,7 +1012,7 @@ ipgre_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
 
                                 t = netdev_priv(dev);
 
-                                if (MULTICAST(p.iph.daddr))
+                                if (ipv4_is_multicast(p.iph.daddr))
                                         nflags = IFF_BROADCAST;
                                 else if (p.iph.daddr)
                                         nflags = IFF_POINTOPOINT;
@@ -1143,7 +1146,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
                 memcpy(&iph->daddr, daddr, 4);
                 return t->hlen;
         }
-        if (iph->daddr && !MULTICAST(iph->daddr))
+        if (iph->daddr && !ipv4_is_multicast(iph->daddr))
                 return t->hlen;
 
         return -t->hlen;
@@ -1166,7 +1169,7 @@ static int ipgre_open(struct net_device *dev)
 {
         struct ip_tunnel *t = netdev_priv(dev);
 
-        if (MULTICAST(t->parms.iph.daddr)) {
+        if (ipv4_is_multicast(t->parms.iph.daddr)) {
                 struct flowi fl = { .oif = t->parms.link,
                                     .nl_u = { .ip4_u =
                                               { .daddr = t->parms.iph.daddr,
@@ -1189,7 +1192,7 @@ static int ipgre_open(struct net_device *dev)
 static int ipgre_close(struct net_device *dev)
 {
         struct ip_tunnel *t = netdev_priv(dev);
-        if (MULTICAST(t->parms.iph.daddr) && t->mlink) {
+        if (ipv4_is_multicast(t->parms.iph.daddr) && t->mlink) {
                 struct in_device *in_dev = inetdev_by_index(t->mlink);
                 if (in_dev) {
                         ip_mc_dec_group(in_dev, t->parms.iph.daddr);
@@ -1236,7 +1239,7 @@ static int ipgre_tunnel_init(struct net_device *dev)
 
         if (iph->daddr) {
 #ifdef CONFIG_NET_IPGRE_BROADCAST
-                if (MULTICAST(iph->daddr)) {
+                if (ipv4_is_multicast(iph->daddr)) {
                         if (!iph->saddr)
                                 return -EINVAL;
                         dev->flags = IFF_BROADCAST;