From: Roland Dreier <roland@purestorage.com>
Date: Mon, 23 Jul 2012 06:26:17 +0000 (-0700)
Subject: Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=089117e1ad265625b523a4168f77f2521b18fd32;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
---

089117e1ad265625b523a4168f77f2521b18fd32
diff --cc drivers/infiniband/core/cma.c
index 8734a6af35d7,2e826f9702c6,4d8f592b1e51,2e826f9702c6,2e826f9702c6,2e826f9702c6,2e826f9702c6..5a335b5447c6
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@@@@@@@ -2222,20 -2194,15 -2194,15 -2194,15 -2194,15 -2194,15 -2194,15 +2222,20 @@@@@@@@ static int cma_check_port(struct rdma_b
       		if (id_priv == cur_id)
       			continue;
       
 ------		if ((cur_id->state == RDMA_CM_LISTEN) ||
 ------		    !reuseaddr || !cur_id->reuseaddr) {
 ------			cur_addr = (struct sockaddr *) &cur_id->id.route.addr.src_addr;
 ------			if (cma_any_addr(cur_addr))
 ------				return -EADDRNOTAVAIL;
 ++++++		if ((cur_id->state != RDMA_CM_LISTEN) && reuseaddr &&
 ++++++		    cur_id->reuseaddr)
 ++++++			continue;
  +    
 - ----			if (!cma_addr_cmp(addr, cur_addr))
 - ----				return -EADDRINUSE;
 - ----		}
 ++++++		cur_addr = (struct sockaddr *) &cur_id->id.route.addr.src_addr;
 ++++++		if (id_priv->afonly && cur_id->afonly &&
 ++++++		    (addr->sa_family != cur_addr->sa_family))
 ++++++			continue;
 ++++++
 ++++++		if (cma_any_addr(addr) || cma_any_addr(cur_addr))
 ++++++			return -EADDRNOTAVAIL;
 + ++++
  -    			if (!cma_addr_cmp(addr, cur_addr))
  -    				return -EADDRINUSE;
  -    		}
 ++++++		if (!cma_addr_cmp(addr, cur_addr))
 ++++++			return -EADDRINUSE;
       	}
       	return 0;
       }