lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ehea: fix port state notification, default queue sizes

Browse Source 
This patch includes a bug fix for the port state notification
and fixes the default queue sizes.

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jan-Bernd Themann
2006-10-05 16:53:14 +02:00
committed by Jeff Garzik
parent 08093c8fd6
commit bff0a55f34
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ehea/ehea.h
View File

@@ -39,7 +39,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "ehea" #define DRV_NAME "ehea"
#define DRV_VERSION "EHEA_0028" #define DRV_VERSION "EHEA_0034"
#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -50,6 +50,7 @@
#define EHEA_MAX_ENTRIES_SQ 32767 #define EHEA_MAX_ENTRIES_SQ 32767
#define EHEA_MIN_ENTRIES_QP 127 #define EHEA_MIN_ENTRIES_QP 127
#define EHEA_SMALL_QUEUES
#define EHEA_NUM_TX_QP 1 #define EHEA_NUM_TX_QP 1
#ifdef EHEA_SMALL_QUEUES #ifdef EHEA_SMALL_QUEUES
@@ -59,11 +60,11 @@
#define EHEA_DEF_ENTRIES_RQ2 1023 #define EHEA_DEF_ENTRIES_RQ2 1023
#define EHEA_DEF_ENTRIES_RQ3 1023 #define EHEA_DEF_ENTRIES_RQ3 1023
#else #else
#define EHEA_MAX_CQE_COUNT 32000 #define EHEA_MAX_CQE_COUNT 4080
#define EHEA_DEF_ENTRIES_SQ 16000 #define EHEA_DEF_ENTRIES_SQ 4080
#define EHEA_DEF_ENTRIES_RQ1 32080 #define EHEA_DEF_ENTRIES_RQ1 8160
#define EHEA_DEF_ENTRIES_RQ2 4020 #define EHEA_DEF_ENTRIES_RQ2 2040
#define EHEA_DEF_ENTRIES_RQ3 4020 #define EHEA_DEF_ENTRIES_RQ3 2040
#endif #endif
#define EHEA_MAX_ENTRIES_EQ 20 #define EHEA_MAX_ENTRIES_EQ 20

6
drivers/net/ehea/ehea_main.c
View File

@@ -766,7 +766,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) { if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {
if (!netif_carrier_ok(port->netdev)) { if (!netif_carrier_ok(port->netdev)) {
ret = ehea_sense_port_attr( ret = ehea_sense_port_attr(
adapter->port[portnum]); port);
if (ret) { if (ret) {
ehea_error("failed resensing port " ehea_error("failed resensing port "
"attributes"); "attributes");
@@ -818,7 +818,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
netif_stop_queue(port->netdev); netif_stop_queue(port->netdev);
break; break;
default: default:
ehea_error("unknown event code %x", ec); ehea_error("unknown event code %x, eqe=0x%lX", ec, eqe);
break; break;
} }
} }
@@ -1841,7 +1841,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (netif_msg_tx_queued(port)) { if (netif_msg_tx_queued(port)) {
ehea_info("post swqe on QP %d", pr->qp->init_attr.qp_nr); ehea_info("post swqe on QP %d", pr->qp->init_attr.qp_nr);
ehea_dump(swqe, sizeof(*swqe), "swqe"); ehea_dump(swqe, 512, "swqe");
} }
ehea_post_swqe(pr->qp, swqe); ehea_post_swqe(pr->qp, swqe);