瀏覽代碼

ehea: Increase the skb array usage

Currently the skb array is not fully allocated, and the allocation
is done as it's requested, which is not the expected way.

This patch just allocate the full skb array at driver initialization.
Also, this patch increases ehea version to 107.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Breno Leitao 14 年之前
父節點
當前提交
f76957fc8f
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 1 1
      drivers/net/ehea/ehea.h
  2. 2 4
      drivers/net/ehea/ehea_main.c

+ 1 - 1
drivers/net/ehea/ehea.h

@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #include <asm/io.h>
 
 
 #define DRV_NAME	"ehea"
 #define DRV_NAME	"ehea"
-#define DRV_VERSION	"EHEA_0106"
+#define DRV_VERSION	"EHEA_0107"
 
 
 /* eHEA capability flags */
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
 #define DLPAR_PORT_ADD_REM 1

+ 2 - 4
drivers/net/ehea/ehea_main.c

@@ -437,7 +437,7 @@ static void ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
 		}
 		}
 	}
 	}
 	/* Ring doorbell */
 	/* Ring doorbell */
-	ehea_update_rq1a(pr->qp, i);
+	ehea_update_rq1a(pr->qp, i - 1);
 }
 }
 
 
 static int ehea_refill_rq_def(struct ehea_port_res *pr,
 static int ehea_refill_rq_def(struct ehea_port_res *pr,
@@ -1329,9 +1329,7 @@ static int ehea_fill_port_res(struct ehea_port_res *pr)
 	int ret;
 	int ret;
 	struct ehea_qp_init_attr *init_attr = &pr->qp->init_attr;
 	struct ehea_qp_init_attr *init_attr = &pr->qp->init_attr;
 
 
-	ehea_init_fill_rq1(pr, init_attr->act_nr_rwqes_rq1
-			       - init_attr->act_nr_rwqes_rq2
-			       - init_attr->act_nr_rwqes_rq3 - 1);
+	ehea_init_fill_rq1(pr, pr->rq1_skba.len);
 
 
 	ret = ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);
 	ret = ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);