2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 5be1bd4fc7ed..bd07803e9183 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -393,7 +393,7 @@ static int addr_resolve_local(struct sockaddr *src_in,
 
                 for_each_netdev(&init_net, dev)
                         if (ipv6_chk_addr(&init_net,
-                                          &((struct sockaddr_in6 *) addr)->sin6_addr,
+                                          &((struct sockaddr_in6 *) dst_in)->sin6_addr,
                                           dev, 1))
                                 break;
 
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index 55d093a36ae4..625fec5a741c 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -362,7 +362,9 @@ static void destroy_cm_id(struct iw_cm_id *cm_id)
                  * In either case, must tell the provider to reject.
                  */
                 cm_id_priv->state = IW_CM_STATE_DESTROYING;
+                spin_unlock_irqrestore(&cm_id_priv->lock, flags);
                 cm_id->device->iwcm->reject(cm_id, NULL, 0);
+                spin_lock_irqsave(&cm_id_priv->lock, flags);
                 break;
         case IW_CM_STATE_CONN_SENT:
         case IW_CM_STATE_DESTROYING: