diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /net/rds | |
| parent | 7ec75c582e639d956ce3afd499f67febe6f902a4 (diff) | |
| parent | e95ef5d3f6bc60433883e1ef65dac747acd0bf1a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/rdma_transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c index 5ea82fc47c3e..e599ba2f950d 100644 --- a/net/rds/rdma_transport.c +++ b/net/rds/rdma_transport.c | |||
| @@ -133,7 +133,7 @@ static int __init rds_rdma_listen_init(void) | |||
| 133 | ret = PTR_ERR(cm_id); | 133 | ret = PTR_ERR(cm_id); |
| 134 | printk(KERN_ERR "RDS/RDMA: failed to setup listener, " | 134 | printk(KERN_ERR "RDS/RDMA: failed to setup listener, " |
| 135 | "rdma_create_id() returned %d\n", ret); | 135 | "rdma_create_id() returned %d\n", ret); |
| 136 | goto out; | 136 | return ret; |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | sin.sin_family = AF_INET, | 139 | sin.sin_family = AF_INET, |