aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhu Yanjun <yanjun.zhu@oracle.com>2017-02-14 03:43:12 -0500
committerDoug Ledford <dledford@redhat.com>2017-02-19 09:18:46 -0500
commit23536dfaa3ef5b4e61272ea65ed6c1b15db022ec (patch)
tree9528db3a6007fa30e157c96096d0ec62983ce148
parentc5e8f57b0b560b9cc9ea9166975858d023f81030 (diff)
IB/ipoib: Remove redudant label
There are 2 labels to mark the same statements. Replace the 2 labels with one versatile labe. Cc: Joe Jin <joe.jin@oracle.com> Cc: Junxiao Bi <junxiao.bi@oracle.com> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> Reviewed-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_cm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index eb8cafe80115..a6d6c617b597 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1157,13 +1157,13 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
1157 ret = ipoib_cm_modify_tx_init(p->dev, p->id, p->qp); 1157 ret = ipoib_cm_modify_tx_init(p->dev, p->id, p->qp);
1158 if (ret) { 1158 if (ret) {
1159 ipoib_warn(priv, "failed to modify tx qp to rtr: %d\n", ret); 1159 ipoib_warn(priv, "failed to modify tx qp to rtr: %d\n", ret);
1160 goto err_modify; 1160 goto err_modify_send;
1161 } 1161 }
1162 1162
1163 ret = ipoib_cm_send_req(p->dev, p->id, p->qp, qpn, pathrec); 1163 ret = ipoib_cm_send_req(p->dev, p->id, p->qp, qpn, pathrec);
1164 if (ret) { 1164 if (ret) {
1165 ipoib_warn(priv, "failed to send cm req: %d\n", ret); 1165 ipoib_warn(priv, "failed to send cm req: %d\n", ret);
1166 goto err_send_cm; 1166 goto err_modify_send;
1167 } 1167 }
1168 1168
1169 ipoib_dbg(priv, "Request connection 0x%x for gid %pI6 qpn 0x%x\n", 1169 ipoib_dbg(priv, "Request connection 0x%x for gid %pI6 qpn 0x%x\n",
@@ -1171,8 +1171,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
1171 1171
1172 return 0; 1172 return 0;
1173 1173
1174err_send_cm: 1174err_modify_send:
1175err_modify:
1176 ib_destroy_cm_id(p->id); 1175 ib_destroy_cm_id(p->id);
1177err_id: 1176err_id:
1178 p->id = NULL; 1177 p->id = NULL;