diff options
| author | Joe Perches <joe@perches.com> | 2007-12-16 13:44:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:58:15 -0800 |
| commit | 21cf2253ebcf070bc307e0b56d696a2519c75cb4 (patch) | |
| tree | 9092cd731d94175b66f4d29437fb023932329a5d | |
| parent | 3db8cda362dced00caf19865ffda3fa1028c59bc (diff) | |
[IPV4] net/core: Use ipv4_is_<type>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/netpoll.c | 3 | ||||
| -rw-r--r-- | net/core/pktgen.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index b1d5acd2fc7..6faa128a4c8 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 285ec3ed9b3..ede1feacddf 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); } |