2 files changed, 7 insertions, 4 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index b1d5acd2fc7a..6faa128a4c8e 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -410,7 +410,8 @@ static void arp_reply(struct sk_buff *skb)
         memcpy(&tip, arp_ptr, 4);
 
         /* Should we ignore arp? */
-        if (tip != htonl(np->local_ip) || LOOPBACK(tip) || MULTICAST(tip))
+        if (tip != htonl(np->local_ip) ||
+            ipv4_is_loopback(tip) || ipv4_is_multicast(tip))
                 return;
 
         size = sizeof(struct arphdr) + 2 * (skb->dev->addr_len + 4);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 285ec3ed9b37..ede1feacddf9 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2358,9 +2358,11 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                                         t = random32() % (imx - imn) + imn;
                                         s = htonl(t);
 
-                                        while (LOOPBACK(s) || MULTICAST(s)
-                                               || BADCLASS(s) || ZERONET(s)
-                                               || LOCAL_MCAST(s)) {
+                                        while (ipv4_is_loopback(s) ||
+                                               ipv4_is_multicast(s) ||
+                                               ipv4_is_badclass(s) ||
+                                               ipv4_is_zeronet(s) ||
+                                               ipv4_is_local_multicast(s)) {
                                                 t = random32() % (imx - imn) + imn;
                                                 s = htonl(t);
                                         }