diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 17:58:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 17:58:11 -0400 |
| commit | cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95 (patch) | |
| tree | d5feaeef197dc681d1cdab2e8070ac31f0c43141 /net/rds/tcp_connect.c | |
| parent | f27e21a813e2c4ca74b30a5443602e75b146db9b (diff) | |
| parent | 905d64c89e2a9d71d0606904b7c3908633db6072 (diff) | |
Merge branch 'for-davem' of git://oss.oracle.com/git/agrover/linux-2.6
Diffstat (limited to 'net/rds/tcp_connect.c')
| -rw-r--r-- | net/rds/tcp_connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c index c397524c039c..a65ee78db0c5 100644 --- a/net/rds/tcp_connect.c +++ b/net/rds/tcp_connect.c | |||
| @@ -45,7 +45,7 @@ void rds_tcp_state_change(struct sock *sk) | |||
| 45 | 45 | ||
| 46 | read_lock(&sk->sk_callback_lock); | 46 | read_lock(&sk->sk_callback_lock); |
| 47 | conn = sk->sk_user_data; | 47 | conn = sk->sk_user_data; |
| 48 | if (conn == NULL) { | 48 | if (!conn) { |
| 49 | state_change = sk->sk_state_change; | 49 | state_change = sk->sk_state_change; |
| 50 | goto out; | 50 | goto out; |
| 51 | } | 51 | } |