[ewg] [PATCH] cma backports: remove check for IFF_BONDING when handling an event

[Moni Shoua]

flag IFF_BONDING isn't recognized in kernels of rhel4u5 and below. cma code from
in upstream kernel uses this value for event filtering but there is no backport that
removes it for old kernels. Instead, there is a kernel addon that defines it. This is not 
enough since ib-bonding (which compiles outside ofaed modules suite) doesn't set
this flag and as a result event are filtered in a wrong way.
Getting rid of  this filter is safe. In rare cases it may save a little time but 
even than, in the slow path.

Signed-off-by: Moni Shoua <monis at voltaire.com>
---
 kernel_patches/backport/2.6.16/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.16_sles10/cma_to_2_6_23.patch     |   13 ++++++----
 kernel_patches/backport/2.6.16_sles10_sp1/cma_to_2_6_23.patch |   13 ++++++----
 kernel_patches/backport/2.6.16_sles10_sp2/cma_to_2_6_23.patch |   13 ++++++----
 kernel_patches/backport/2.6.17/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.18-EL5.1/cma_to_2_6_23.patch      |   13 ++++++----
 kernel_patches/backport/2.6.18-EL5.2/cma_to_2_6_23.patch      |   13 ++++++----
 kernel_patches/backport/2.6.18/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.18_FC6/cma_to_2_6_23.patch        |   13 ++++++----
 kernel_patches/backport/2.6.18_suse10_2/cma_to_2_6_23.patch   |   13 ++++++----
 kernel_patches/backport/2.6.19/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.20/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.21/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.22/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.22_suse10_3/cma_to_2_6_23.patch   |   13 ++++++----
 kernel_patches/backport/2.6.23/cma_to_2_6_23.patch            |   13 ++++++----
 kernel_patches/backport/2.6.9_U4/cma_to_2_6_23.patch          |   13 ++++++----
 kernel_patches/backport/2.6.9_U5/cma_to_2_6_23.patch          |   13 ++++++----
 kernel_patches/backport/2.6.9_U6/cma_to_2_6_23.patch          |   13 ++++++----
 19 files changed, 171 insertions(+), 76 deletions(-)


diff --git a/kernel_patches/backport/2.6.16/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.16/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.16/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.16/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.16_sles10/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.16_sles10/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.16_sles10/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.16_sles10/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.16_sles10_sp1/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.16_sles10_sp1/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.16_sles10_sp1/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.16_sles10_sp1/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.16_sles10_sp2/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.16_sles10_sp2/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.16_sles10_sp2/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.16_sles10_sp2/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.17/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.17/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.17/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.17/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.18-EL5.1/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.18-EL5.1/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.18-EL5.1/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.18-EL5.1/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.18-EL5.2/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.18-EL5.2/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.18-EL5.2/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.18-EL5.2/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.18/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.18/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.18/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.18/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.18_FC6/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.18_FC6/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.18_FC6/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.18_FC6/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.18_suse10_2/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.18_suse10_2/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.18_suse10_2/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.18_suse10_2/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.19/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.19/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.19/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.19/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.20/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.20/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.20/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.20/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.21/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.21/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.21/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.21/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.22/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.22/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.22/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.22/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.22_suse10_3/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.22_suse10_3/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.22_suse10_3/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.22_suse10_3/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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.23/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.23/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.23/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.23/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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_U4/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.9_U4/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.9_U4/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.9_U4/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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_U5/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.9_U5/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.9_U5/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.9_U5/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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_U6/cma_to_2_6_23.patch b/kernel_patches/backport/2.6.9_U6/cma_to_2_6_23.patch
index 9ad7660..330feae 100644
--- a/kernel_patches/backport/2.6.9_U6/cma_to_2_6_23.patch
+++ b/kernel_patches/backport/2.6.9_U6/cma_to_2_6_23.patch
@@ -1,8 +1,8 @@
-Index: ofed_kernel/drivers/infiniband/core/cma.c
+Index: ofa_kernel-1.4/drivers/infiniband/core/cma.c
 ===================================================================
---- ofed_kernel.orig/drivers/infiniband/core/cma.c
-+++ ofed_kernel/drivers/infiniband/core/cma.c
-@@ -2804,9 +2804,6 @@ static int cma_netdev_callback(struct no
+--- ofa_kernel-1.4.orig/drivers/infiniband/core/cma.c	2008-09-03 16:13:44.000000000 -0400
++++ ofa_kernel-1.4/drivers/infiniband/core/cma.c	2008-09-03 16:24:06.000000000 -0400
+@@ -2835,13 +2835,10 @@
  	struct rdma_id_private *id_priv;
  	int ret = NOTIFY_DONE;
  
@@ -12,3 +12,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);