mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-30 11:04:25 +00:00
[IPV4] net/core: Use ipv4_is_<type>
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3db8cda362
commit
21cf2253eb
2 changed files with 7 additions and 4 deletions
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue