From b24b9d12a54195b050f075b2c0a1095a0ed242a7 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Fri, 17 Jul 2009 13:13:35 +0000 Subject: [PATCH] --- yaml --- r: 159008 b: refs/heads/master c: ed9e352a350ec85eb354046e0db6a86019620f53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/rds/iw.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c66659ef87e2..535217dd72a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 404bb72a56e553febe1055f98347a7a3e3145759 +refs/heads/master: ed9e352a350ec85eb354046e0db6a86019620f53 diff --git a/trunk/net/rds/iw.c b/trunk/net/rds/iw.c index 2e6b495502c1..f5e9a29a80a7 100644 --- a/trunk/net/rds/iw.c +++ b/trunk/net/rds/iw.c @@ -89,15 +89,10 @@ void rds_iw_add_one(struct ib_device *device) goto free_dev; if (!rds_iwdev->dma_local_lkey) { - if (device->node_type != RDMA_NODE_RNIC) { - rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd, - IB_ACCESS_LOCAL_WRITE); - } else { - rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd, - IB_ACCESS_REMOTE_READ | - IB_ACCESS_REMOTE_WRITE | - IB_ACCESS_LOCAL_WRITE); - } + rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd, + IB_ACCESS_REMOTE_READ | + IB_ACCESS_REMOTE_WRITE | + IB_ACCESS_LOCAL_WRITE); if (IS_ERR(rds_iwdev->mr)) goto err_pd; } else