From f8deddce3b9bb9f097163a11aefe43a5a7a18fd5 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Thu, 9 Apr 2009 14:09:37 +0000 Subject: [PATCH] --- yaml --- r: 149711 b: refs/heads/master c: 11bc9421da3040c71fc96da1a31e95217e8cf2af h: refs/heads/master i: 149709: 06db6b4ab6f81d2eb72b27684ea0eb0e0b6ca9f4 149707: 9de07a2840f98d055fbfdb3df91a1d94ec34e828 149703: 9abfe168e06f6f303493ed49a0c5810d0e040a2a 149695: b230218715a64cc67e232ace2b18e12fdd8550af v: v3 --- [refs] | 2 +- trunk/net/rds/rdma_transport.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 95b9dc0937a9..e3e4b198d0fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cd2fe6d54c91aa76893b3034f5f3473063c0202 +refs/heads/master: 11bc9421da3040c71fc96da1a31e95217e8cf2af diff --git a/trunk/net/rds/rdma_transport.c b/trunk/net/rds/rdma_transport.c index 7b19024f9706..7d0f901c93d5 100644 --- a/trunk/net/rds/rdma_transport.c +++ b/trunk/net/rds/rdma_transport.c @@ -34,7 +34,7 @@ #include "rdma_transport.h" -static struct rdma_cm_id *rds_iw_listen_id; +static struct rdma_cm_id *rds_rdma_listen_id; int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id, struct rdma_cm_event *event) @@ -161,7 +161,7 @@ static int __init rds_rdma_listen_init(void) rdsdebug("cm %p listening on port %u\n", cm_id, RDS_PORT); - rds_iw_listen_id = cm_id; + rds_rdma_listen_id = cm_id; cm_id = NULL; out: if (cm_id) @@ -171,10 +171,10 @@ static int __init rds_rdma_listen_init(void) static void rds_rdma_listen_stop(void) { - if (rds_iw_listen_id) { - rdsdebug("cm %p\n", rds_iw_listen_id); - rdma_destroy_id(rds_iw_listen_id); - rds_iw_listen_id = NULL; + if (rds_rdma_listen_id) { + rdsdebug("cm %p\n", rds_rdma_listen_id); + rdma_destroy_id(rds_rdma_listen_id); + rds_rdma_listen_id = NULL; } }