Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / net / rds / tcp_connect.c

diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index 211522f9a9a260cfcd68a7dc2d92c61dba70068a..056256285987dea30ffcb2a93b71bf5af8b904c1 100644 (file)
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -90,8 +90,8 @@ int rds_tcp_conn_connect(struct rds_connection *conn)
 
        ret = sock->ops->bind(sock, (struct sockaddr *)&src, sizeof(src));
        if (ret) {
-               rdsdebug("bind failed with %d at address %u.%u.%u.%u\n",
-                    ret, NIPQUAD(conn->c_laddr));
+               rdsdebug("bind failed with %d at address %pI4\n",
+                        ret, &conn->c_laddr);
                goto out;
        }
 
@@ -108,8 +108,7 @@ int rds_tcp_conn_connect(struct rds_connection *conn)
                                 O_NONBLOCK);
        sock = NULL;
 
-       rdsdebug("connect to address %u.%u.%u.%u returned %d\n",
-                NIPQUAD(conn->c_faddr), ret);
+       rdsdebug("connect to address %pI4 returned %d\n", &conn->c_faddr, ret);
        if (ret == -EINPROGRESS)
                ret = 0;