1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 637efead97a0..1eff1b2c0e08 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -630,7 +630,8 @@ static inline int cma_zero_addr(struct sockaddr *addr)
         struct in6_addr *ip6;
 
         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 {
                 ip6 = &((struct sockaddr_in6 *) addr)->sin6_addr;
                 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)
 {
-        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)
@@ -1288,7 +1289,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         atomic_inc(&conn_id->dev_remove);
         conn_id->state = CMA_CONNECT;
 
-        dev = ip_dev_find(iw_event->local_addr.sin_addr.s_addr);
+        dev = ip_dev_find(&init_net, iw_event->local_addr.sin_addr.s_addr);
         if (!dev) {
                 ret = -EADDRNOTAVAIL;
                 cma_enable_remove(conn_id);