Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

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

diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 24b743eb0b1b3951618a184615ee601e25ce81ea..45474a4368625431db0a112b3f172bfc7615f002 100644 (file)
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -67,11 +67,11 @@ static int rds_tcp_accept_one(struct socket *sock)
        inet = inet_sk(new_sock->sk);
 
        rdsdebug("accepted tcp %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n",
-                 NIPQUAD(inet->saddr), ntohs(inet->sport),
-                 NIPQUAD(inet->daddr), ntohs(inet->dport));
+                 NIPQUAD(inet->inet_saddr), ntohs(inet->inet_sport),
+                 NIPQUAD(inet->inet_daddr), ntohs(inet->inet_dport));
 
-       conn = rds_conn_create(inet->saddr, inet->daddr, &rds_tcp_transport,
-                              GFP_KERNEL);
+       conn = rds_conn_create(inet->inet_saddr, inet->inet_daddr,
+                              &rds_tcp_transport, GFP_KERNEL);
        if (IS_ERR(conn)) {
                ret = PTR_ERR(conn);
                goto out;