[ewg] [PATCH] rdma_cm: Address change event is not sent under RHEL4.7/8

[Moni Shoua]

Fix the bug where rdma_cm doesn't send the event RDMA_CM_EVENT_ADDR_CHANG under
RHEL4.7 and RHEL4.8. This only needed to copy the backport of RHEL4.6 to the backport
directory of RHEL4.7 and RHEL4.8.

This commit closes https://bugs.openfabrics.org/show_bug.cgi?id=1998

Signed-off-by: Moni Shoua <monis at voltaire.com>

---

diff --git a/kernel_patches/backport/2.6.9_U7/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.9_U7/cma_to_2_6_23.patch
index 9892b78..82f24b3 100644
--- a/kernel_patches/backport/2.6.9_U7/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.9_U7/cma_to_2_6_23.patch
@@ -1,12 +1,12 @@
 ---
- drivers/infiniband/core/cma.c |    3 ---
- 1 file changed, 3 deletions(-)
+ drivers/infiniband/core/cma.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
 
 Index: ofed_kernel/drivers/infiniband/core/cma.c
 ===================================================================
 --- ofed_kernel.orig/drivers/infiniband/core/cma.c
 +++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2835,9 +2835,6 @@ static int cma_netdev_callback(struct no
+@@ -2835,13 +2835,10 @@ static int cma_netdev_callback(struct no
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -16,3 +16,8 @@ Index: ofed_kernel/drivers/infiniband/core/cma.c
  	if (event != NETDEV_BONDING_FAILOVER)
  		return NOTIFY_DONE;
  
+-	if (!(ndev->flags & IFF_MASTER) || !(ndev->priv_flags & IFF_BONDING))
++	if (!(ndev->flags & IFF_MASTER))
+ 		return NOTIFY_DONE;
+ 
+ 	mutex_lock(&lock);
diff --git a/kernel_patches/backport/2.6.9_U8/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.9_U8/cma_to_2_6_23.patch
index 9892b78..82f24b3 100644
--- a/kernel_patches/backport/2.6.9_U8/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.9_U8/cma_to_2_6_23.patch
@@ -1,12 +1,12 @@
 ---
- drivers/infiniband/core/cma.c |    3 ---
- 1 file changed, 3 deletions(-)
+ drivers/infiniband/core/cma.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
 
 Index: ofed_kernel/drivers/infiniband/core/cma.c
 ===================================================================
 --- ofed_kernel.orig/drivers/infiniband/core/cma.c
 +++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2835,9 +2835,6 @@ static int cma_netdev_callback(struct no
+@@ -2835,13 +2835,10 @@ static int cma_netdev_callback(struct no
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -16,3 +16,8 @@ Index: ofed_kernel/drivers/infiniband/core/cma.c
  	if (event != NETDEV_BONDING_FAILOVER)
  		return NOTIFY_DONE;
  
+-	if (!(ndev->flags & IFF_MASTER) || !(ndev->priv_flags & IFF_BONDING))
++	if (!(ndev->flags & IFF_MASTER))
+ 		return NOTIFY_DONE;
+ 
+ 	mutex_lock(&lock);