Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21cf2253 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3db8cda3

net/core/netpoll.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -410,7 +410,8 @@ static void arp_reply(struct sk_buff *skb) 
	memcpy(&tip, arp_ptr, 4);

	memcpy(&tip, arp_ptr, 4);





	/* Should we ignore arp? */

	/* 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;

		return;





	size = sizeof(struct arphdr) + 2 * (skb->dev->addr_len + 4);

	size = sizeof(struct arphdr) + 2 * (skb->dev->addr_len + 4);

net/core/pktgen.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -2358,9 +2358,11 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev) 
					t = random32() % (imx - imn) + imn;

					t = random32() % (imx - imn) + imn;

					s = htonl(t);

					s = htonl(t);





					while (LOOPBACK(s) || MULTICAST(s)

					while (ipv4_is_loopback(s) ||

					       || BADCLASS(s) || ZERONET(s)

					       ipv4_is_multicast(s) ||

					       || LOCAL_MCAST(s)) {

					       ipv4_is_badclass(s) ||

					       ipv4_is_zeronet(s) ||

					       ipv4_is_local_multicast(s)) {

						t = random32() % (imx - imn) + imn;

						t = random32() % (imx - imn) + imn;

						s = htonl(t);

						s = htonl(t);

					}

					}