Commit bff0a55f authored by Jan-Bernd Themann's avatar Jan-Bernd Themann Committed by Jeff Garzik
Browse files

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



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

Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 08093c8f

drivers/net/ehea/ehea.h

+7 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0028"

#define DRV_VERSION	"EHEA_0034"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -50,6 +50,7 @@ 
#define EHEA_MAX_ENTRIES_SQ  32767

#define EHEA_MIN_ENTRIES_QP  127



#define EHEA_SMALL_QUEUES

#define EHEA_NUM_TX_QP 1



#ifdef EHEA_SMALL_QUEUES
@@ -59,11 +60,11 @@ 
#define EHEA_DEF_ENTRIES_RQ2    1023

#define EHEA_DEF_ENTRIES_RQ3    1023

#else

#define EHEA_MAX_CQE_COUNT     32000

#define EHEA_DEF_ENTRIES_SQ    16000

#define EHEA_DEF_ENTRIES_RQ1   32080

#define EHEA_DEF_ENTRIES_RQ2    4020

#define EHEA_DEF_ENTRIES_RQ3    4020

#define EHEA_MAX_CQE_COUNT      4080

#define EHEA_DEF_ENTRIES_SQ     4080

#define EHEA_DEF_ENTRIES_RQ1    8160

#define EHEA_DEF_ENTRIES_RQ2    2040

#define EHEA_DEF_ENTRIES_RQ3    2040

#endif



#define EHEA_MAX_ENTRIES_EQ 20

drivers/net/ehea/ehea_main.c

+3 −3
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe) 
		if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {

			if (!netif_carrier_ok(port->netdev)) {

				ret = ehea_sense_port_attr(

					adapter->port[portnum]);

					port);

				if (ret) {

					ehea_error("failed resensing port "

						   "attributes");
@@ -818,7 +818,7 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe) 
		netif_stop_queue(port->netdev);

		break;

	default:

		ehea_error("unknown event code %x", ec);

		ehea_error("unknown event code %x, eqe=0x%lX", ec, eqe);

		break;

	}

}
@@ -1841,7 +1841,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	if (netif_msg_tx_queued(port)) {

		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);