diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /net/rds/iw.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'net/rds/iw.c')
| -rw-r--r-- | net/rds/iw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/iw.c b/net/rds/iw.c index b732efb5b634..d16e1cbc8e83 100644 --- a/net/rds/iw.c +++ b/net/rds/iw.c | |||
| @@ -233,8 +233,8 @@ static int rds_iw_laddr_check(__be32 addr) | |||
| 233 | * IB and iWARP capable NICs. | 233 | * IB and iWARP capable NICs. |
| 234 | */ | 234 | */ |
| 235 | cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP); | 235 | cm_id = rdma_create_id(NULL, NULL, RDMA_PS_TCP); |
| 236 | if (!cm_id) | 236 | if (IS_ERR(cm_id)) |
| 237 | return -EADDRNOTAVAIL; | 237 | return PTR_ERR(cm_id); |
| 238 | 238 | ||
| 239 | memset(&sin, 0, sizeof(sin)); | 239 | memset(&sin, 0, sizeof(sin)); |
| 240 | sin.sin_family = AF_INET; | 240 | sin.sin_family = AF_INET; |