From e6658bbb66e5a124de330c229ab9e23bc26a7fbb Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 16 Dec 2007 13:44:00 -0800
Subject: [PATCH] --- yaml --- r: 78478 b: refs/heads/master c:
 21cf2253ebcf070bc307e0b56d696a2519c75cb4 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 3 ++-
 trunk/net/core/pktgen.c  | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b7107de6ae1b..b0f73cff3ea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3db8cda362dced00caf19865ffda3fa1028c59bc
+refs/heads/master: 21cf2253ebcf070bc307e0b56d696a2519c75cb4
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index b1d5acd2fc7a..6faa128a4c8e 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/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/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
index 285ec3ed9b37..ede1feacddf9 100644
--- a/trunk/net/core/pktgen.c
+++ b/trunk/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);
 					}