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

Commit 6360a02a authored Dec 16, 2007 by Joe Perches Committed by David S. Miller Jan 28, 2008

[IPV4] drivers/infiniband: Use ipv4_is_<type>



Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b5cb2bbc

drivers/infiniband/core/addr.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -265,11 +265,11 @@ static int addr_resolve_local(struct sockaddr_in *src_in,
	if (!dev)		if (!dev)
	return -EADDRNOTAVAIL;		return -EADDRNOTAVAIL;

	if (ZERONET(src_ip)) {		if (ipv4_is_zeronet(src_ip)) {
	src_in->sin_family = dst_in->sin_family;		src_in->sin_family = dst_in->sin_family;
	src_in->sin_addr.s_addr = dst_ip;		src_in->sin_addr.s_addr = dst_ip;
	ret = rdma_copy_addr(addr, dev, dev->dev_addr);		ret = rdma_copy_addr(addr, dev, dev->dev_addr);
	} else if (LOOPBACK(src_ip)) {		} else if (ipv4_is_loopback(src_ip)) {
	ret = rdma_translate_ip((struct sockaddr *)dst_in, addr);		ret = rdma_translate_ip((struct sockaddr *)dst_in, addr);
	if (!ret)		if (!ret)
	memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);		memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);

drivers/infiniband/core/cma.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -630,7 +630,8 @@ static inline int cma_zero_addr(struct sockaddr *addr)
	struct in6_addr *ip6;		struct in6_addr *ip6;

	if (addr->sa_family == AF_INET)		if (addr->sa_family == AF_INET)
	return ZERONET(((struct sockaddr_in *) addr)->sin_addr.s_addr);		return ipv4_is_zeronet(
			((struct sockaddr_in *)addr)->sin_addr.s_addr);
	else {		else {
	ip6 = &((struct sockaddr_in6 *) addr)->sin6_addr;		ip6 = &((struct sockaddr_in6 *) addr)->sin6_addr;
	return (ip6->s6_addr32[0] \| ip6->s6_addr32[1] \|		return (ip6->s6_addr32[0] \| ip6->s6_addr32[1] \|
	@@ -640,7 +641,7 @@ static inline int cma_zero_addr(struct sockaddr *addr)

	static inline int cma_loopback_addr(struct sockaddr *addr)		static inline int cma_loopback_addr(struct sockaddr *addr)
	{		{
	return LOOPBACK(((struct sockaddr_in *) addr)->sin_addr.s_addr);		return ipv4_is_loopback(((struct sockaddr_in *) addr)->sin_addr.s_addr);
	}		}

	static inline int cma_any_addr(struct sockaddr *addr)		static inline int cma_any_addr(struct sockaddr *addr)