Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Convert usage of IN_MULTICAST to ipv4_is_multicast

IN_MULTICAST's primary intent is as a uapi macro.

Elsewhere in the kernel we use ipv4_is_multicast consistently.

This patch unifies linux's multicast checks to use that function
rather than this macro.

Signed-off-by: Dave Taht <dave.taht@gmail.com>
Reviewed-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Dave Taht and committed by
David S. Miller
842841ec 9367fa08

+9 -9
+1 -1
drivers/net/geneve.c
··· 1345 1345 info->key.u.ipv4.dst = 1346 1346 nla_get_in_addr(data[IFLA_GENEVE_REMOTE]); 1347 1347 1348 - if (IN_MULTICAST(ntohl(info->key.u.ipv4.dst))) { 1348 + if (ipv4_is_multicast(info->key.u.ipv4.dst)) { 1349 1349 NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_REMOTE], 1350 1350 "Remote IPv4 address cannot be Multicast"); 1351 1351 return -EINVAL;
+2 -2
include/net/vxlan.h
··· 391 391 if (ipa->sa.sa_family == AF_INET6) 392 392 return ipv6_addr_is_multicast(&ipa->sin6.sin6_addr); 393 393 else 394 - return IN_MULTICAST(ntohl(ipa->sin.sin_addr.s_addr)); 394 + return ipv4_is_multicast(ipa->sin.sin_addr.s_addr); 395 395 } 396 396 397 397 #else /* !IS_ENABLED(CONFIG_IPV6) */ ··· 403 403 404 404 static inline bool vxlan_addr_multicast(const union vxlan_addr *ipa) 405 405 { 406 - return IN_MULTICAST(ntohl(ipa->sin.sin_addr.s_addr)); 406 + return ipv4_is_multicast(ipa->sin.sin_addr.s_addr); 407 407 } 408 408 409 409 #endif /* IS_ENABLED(CONFIG_IPV6) */
+2 -2
net/rds/af_rds.c
··· 559 559 ret = -EDESTADDRREQ; 560 560 break; 561 561 } 562 - if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) || 562 + if (ipv4_is_multicast(sin->sin_addr.s_addr) || 563 563 sin->sin_addr.s_addr == htonl(INADDR_BROADCAST)) { 564 564 ret = -EINVAL; 565 565 break; ··· 593 593 addr4 = sin6->sin6_addr.s6_addr32[3]; 594 594 if (addr4 == htonl(INADDR_ANY) || 595 595 addr4 == htonl(INADDR_BROADCAST) || 596 - IN_MULTICAST(ntohl(addr4))) { 596 + ipv4_is_multicast(addr4)) { 597 597 ret = -EPROTOTYPE; 598 598 break; 599 599 }
+2 -2
net/rds/bind.c
··· 181 181 if (addr_len < sizeof(struct sockaddr_in) || 182 182 sin->sin_addr.s_addr == htonl(INADDR_ANY) || 183 183 sin->sin_addr.s_addr == htonl(INADDR_BROADCAST) || 184 - IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) 184 + ipv4_is_multicast(sin->sin_addr.s_addr)) 185 185 return -EINVAL; 186 186 ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &v6addr); 187 187 binding_addr = &v6addr; ··· 206 206 addr4 = sin6->sin6_addr.s6_addr32[3]; 207 207 if (addr4 == htonl(INADDR_ANY) || 208 208 addr4 == htonl(INADDR_BROADCAST) || 209 - IN_MULTICAST(ntohl(addr4))) 209 + ipv4_is_multicast(addr4)) 210 210 return -EINVAL; 211 211 } 212 212 /* The scope ID must be specified for link local address. */
+2 -2
net/rds/send.c
··· 1144 1144 case AF_INET: 1145 1145 if (usin->sin_addr.s_addr == htonl(INADDR_ANY) || 1146 1146 usin->sin_addr.s_addr == htonl(INADDR_BROADCAST) || 1147 - IN_MULTICAST(ntohl(usin->sin_addr.s_addr))) { 1147 + ipv4_is_multicast(usin->sin_addr.s_addr)) { 1148 1148 ret = -EINVAL; 1149 1149 goto out; 1150 1150 } ··· 1175 1175 addr4 = sin6->sin6_addr.s6_addr32[3]; 1176 1176 if (addr4 == htonl(INADDR_ANY) || 1177 1177 addr4 == htonl(INADDR_BROADCAST) || 1178 - IN_MULTICAST(ntohl(addr4))) { 1178 + ipv4_is_multicast(addr4)) { 1179 1179 ret = -EINVAL; 1180 1180 goto out; 1181 1181 }