diff options
author | Krishna Kumar <krkumar2@in.ibm.com> | 2006-11-08 23:00:45 -0500 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2006-11-29 18:33:08 -0500 |
commit | 715a588f420936ecdb813c4fcd40dff7a16b1638 (patch) | |
tree | 2b6e88c8867dbf5bef28078de0692481e7d8e796 /drivers/infiniband | |
parent | 13fccdb380f88770f05b922c273d907aecda7c12 (diff) |
RDMA/iwcm: Remove unnecessary function argument
Remove unnecessary cm_id_priv argument to copy_private_data(), and
change text to reflect the code. Fix couple of typos in comments.
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/core/iwcm.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c index b02e54136acd..54faa033d89e 100644 --- a/drivers/infiniband/core/iwcm.c +++ b/drivers/infiniband/core/iwcm.c | |||
@@ -80,7 +80,7 @@ struct iwcm_work { | |||
80 | * 1) in the event upcall, cm_event_handler(), for a listening cm_id. If | 80 | * 1) in the event upcall, cm_event_handler(), for a listening cm_id. If |
81 | * the backlog is exceeded, then no more connection request events will | 81 | * the backlog is exceeded, then no more connection request events will |
82 | * be processed. cm_event_handler() returns -ENOMEM in this case. Its up | 82 | * be processed. cm_event_handler() returns -ENOMEM in this case. Its up |
83 | * to the provider to reject the connectino request. | 83 | * to the provider to reject the connection request. |
84 | * 2) in the connection request workqueue handler, cm_conn_req_handler(). | 84 | * 2) in the connection request workqueue handler, cm_conn_req_handler(). |
85 | * If work elements cannot be allocated for the new connect request cm_id, | 85 | * If work elements cannot be allocated for the new connect request cm_id, |
86 | * then IWCM will call the provider reject method. This is ok since | 86 | * then IWCM will call the provider reject method. This is ok since |
@@ -131,12 +131,11 @@ static int alloc_work_entries(struct iwcm_id_private *cm_id_priv, int count) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | /* | 133 | /* |
134 | * Save private data from incoming connection requests in the | 134 | * Save private data from incoming connection requests to |
135 | * cm_id_priv so the low level driver doesn't have to. Adjust | 135 | * iw_cm_event, so the low level driver doesn't have to. Adjust |
136 | * the event ptr to point to the local copy. | 136 | * the event ptr to point to the local copy. |
137 | */ | 137 | */ |
138 | static int copy_private_data(struct iwcm_id_private *cm_id_priv, | 138 | static int copy_private_data(struct iw_cm_event *event) |
139 | struct iw_cm_event *event) | ||
140 | { | 139 | { |
141 | void *p; | 140 | void *p; |
142 | 141 | ||
@@ -242,7 +241,7 @@ static int iwcm_modify_qp_sqd(struct ib_qp *qp) | |||
242 | /* | 241 | /* |
243 | * CM_ID <-- CLOSING | 242 | * CM_ID <-- CLOSING |
244 | * | 243 | * |
245 | * Block if a passive or active connection is currenlty being processed. Then | 244 | * Block if a passive or active connection is currently being processed. Then |
246 | * process the event as follows: | 245 | * process the event as follows: |
247 | * - If we are ESTABLISHED, move to CLOSING and modify the QP state | 246 | * - If we are ESTABLISHED, move to CLOSING and modify the QP state |
248 | * based on the abrupt flag | 247 | * based on the abrupt flag |
@@ -907,7 +906,7 @@ static int cm_event_handler(struct iw_cm_id *cm_id, | |||
907 | if ((work->event.event == IW_CM_EVENT_CONNECT_REQUEST || | 906 | if ((work->event.event == IW_CM_EVENT_CONNECT_REQUEST || |
908 | work->event.event == IW_CM_EVENT_CONNECT_REPLY) && | 907 | work->event.event == IW_CM_EVENT_CONNECT_REPLY) && |
909 | work->event.private_data_len) { | 908 | work->event.private_data_len) { |
910 | ret = copy_private_data(cm_id_priv, &work->event); | 909 | ret = copy_private_data(&work->event); |
911 | if (ret) { | 910 | if (ret) { |
912 | put_work(work); | 911 | put_work(work); |
913 | goto out; | 912 | goto out; |