Hey Yevgeny,

Please pull from

ssh://[email protected]/~swise/scm/ofed_kernel.git ofed_1_5

This fixes bug 1706.

Thanks,

Steve.


------

RDMA/cxgb3: correctly setup qsets for 2 port cards in backports

Signed-off-by: Steve Wise <[email protected]>
---

.../2.6.16_sles10_sp2/cxgb3_0010_napi.patch        |    2 +-
.../backport/2.6.18-EL5.2/cxgb3_0010_napi.patch    |    2 +-
.../backport/2.6.18-EL5.3/cxgb3_0010_napi.patch    |    2 +-
.../backport/2.6.18/cxgb3_0010_napi.patch          |    2 +-
.../backport/2.6.19/cxgb3_0010_napi.patch          |    2 +-
.../backport/2.6.20/cxgb3_0010_napi.patch          |    2 +-
.../backport/2.6.21/cxgb3_0010_napi.patch          |    2 +-
.../backport/2.6.22/cxgb3_0010_napi.patch          |    2 +-
.../backport/2.6.23/cxgb3_0010_napi.patch          |    2 +-
.../backport/2.6.9_U6/cxgb3_0010_napi.patch        |    2 +-
.../backport/2.6.9_U7/cxgb3_0010_napi.patch        |    2 +-
11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel_patches/backport/2.6.16_sles10_sp2/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.16_sles10_sp2/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.16_sles10_sp2/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.16_sles10_sp2/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.18-EL5.2/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.18-EL5.2/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100755
--- a/kernel_patches/backport/2.6.18-EL5.2/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.18-EL5.2/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.18-EL5.3/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.18-EL5.3/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.18-EL5.3/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.18-EL5.3/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.18/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.18/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.18/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.18/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.19/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.19/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.19/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.19/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.20/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.20/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.20/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.20/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.21/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.21/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.21/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.21/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.22/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.22/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.22/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.22/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.23/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.23/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.23/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.23/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.9_U6/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.9_U6/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.9_U6/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.9_U6/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);
diff --git a/kernel_patches/backport/2.6.9_U7/cxgb3_0010_napi.patch 
b/kernel_patches/backport/2.6.9_U7/cxgb3_0010_napi.patch
index f3b3005..104d5e4 100644
--- a/kernel_patches/backport/2.6.9_U7/cxgb3_0010_napi.patch
+++ b/kernel_patches/backport/2.6.9_U7/cxgb3_0010_napi.patch
@@ -193,7 +193,7 @@ index 06aa147..b994948 100644
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+ &adap->params.sge.qset[qset_idx], ntxq, -+ j == 0 ? dev :
++                              j == pi->first_qset ? dev :
+                                        adap->dummy_netdev[dummy_dev_idx++]);
                        if (err) {
                                t3_free_sge_resources(adap);

_______________________________________________
ewg mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg

Reply via email to