From 1d0fc3c561f23d53d26d8d8641e5eee0c7c603e3 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 15 Sep 2010 18:32:39 +0200 Subject: [PATCH] --- yaml --- r: 217753 b: refs/heads/master c: 4d8d6389b26d8bee06cd706caf1fd3f1ccaa0205 h: refs/heads/master i: 217751: 12f12f45e745c20ffde1efeb8973343148e7dbf8 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_cm.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9615bb1dfde..4bc79b38d8d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 183ae74bda75b1cfda632b42cdc916853e2dded4 +refs/heads/master: 4d8d6389b26d8bee06cd706caf1fd3f1ccaa0205 diff --git a/trunk/drivers/infiniband/hw/nes/nes_cm.c b/trunk/drivers/infiniband/hw/nes/nes_cm.c index 61e0efd4ccfb..5c8d34cb6a23 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_cm.c +++ b/trunk/drivers/infiniband/hw/nes/nes_cm.c @@ -1424,7 +1424,6 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb, { int reset = 0; /* whether to send reset in case of err.. */ - int passive_state; atomic_inc(&cm_resets_recvd); nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u." " refcnt=%d\n", cm_node, cm_node->state, @@ -1439,7 +1438,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb, active_open_err(cm_node, skb, reset); break; case NES_CM_STATE_MPAREQ_RCVD: - passive_state = atomic_add_return(1, &cm_node->passive_state); + atomic_inc(&cm_node->passive_state); dev_kfree_skb_any(skb); break; case NES_CM_STATE_ESTABLISHED: