From dbac025f34cda9fc503c4d50574a9a491dbeb8cf Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 14 Oct 2011 05:31:00 +0000
Subject: [PATCH] --- yaml --- r: 266815 b: refs/heads/master c:
 222ca96b69ae8afb2ad13b99070b09309e7d9657 h: refs/heads/master i:   266813:
 1b5cda51828ca7d17dc119aed9d832394a330870   266811:
 0d51419d5f8f20ce5c7a39e33f75ff31d341195f   266807:
 c08b340d0a84ca769e75ec711fec5cf409011241   266799:
 0204991d019ccc6be17995efa3d69ad7ac4cdf64   266783:
 a5cc8cbfa88d460756874522d89ee8d20ca0895d   266751:
 298bff5d324dbb069ef53835943fd98ce7d4c38f v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/ethernet/ibm/ehea/ehea.h      |  1 -
 trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c | 13 +++----------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index cdeb78670a7f..61be25f21932 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b95644685d530de5e9f9658bd8087e50840b831d
+refs/heads/master: 222ca96b69ae8afb2ad13b99070b09309e7d9657
diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea.h
index e247927139ba..4a4d466e9ce0 100644
--- a/trunk/drivers/net/ethernet/ibm/ehea/ehea.h
+++ b/trunk/drivers/net/ethernet/ibm/ehea/ehea.h
@@ -383,7 +383,6 @@ struct ehea_port_res {
 	u64 tx_bytes;
 	u64 rx_packets;
 	u64 rx_bytes;
-	u32 poll_counter;
 	struct net_lro_mgr lro_mgr;
 	struct net_lro_desc lro_desc[MAX_LRO_DESCRIPTORS];
 	int sq_restart_flag;
diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
index a6c4192e12f4..4032a0a6b929 100644
--- a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -926,7 +926,6 @@ static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
 	return cqe;
 }
 
-#define EHEA_NAPI_POLL_NUM_BEFORE_IRQ 16
 #define EHEA_POLL_MAX_CQES 65535
 
 static int ehea_poll(struct napi_struct *napi, int budget)
@@ -936,18 +935,13 @@ static int ehea_poll(struct napi_struct *napi, int budget)
 	struct net_device *dev = pr->port->netdev;
 	struct ehea_cqe *cqe;
 	struct ehea_cqe *cqe_skb = NULL;
-	int force_irq, wqe_index;
+	int wqe_index;
 	int rx = 0;
 
-	force_irq = (pr->poll_counter > EHEA_NAPI_POLL_NUM_BEFORE_IRQ);
 	cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);
+	rx += ehea_proc_rwqes(dev, pr, budget - rx);
 
-	if (!force_irq)
-		rx += ehea_proc_rwqes(dev, pr, budget - rx);
-
-	while ((rx != budget) || force_irq) {
-		pr->poll_counter = 0;
-		force_irq = 0;
+	while (rx != budget) {
 		napi_complete(napi);
 		ehea_reset_cq_ep(pr->recv_cq);
 		ehea_reset_cq_ep(pr->send_cq);
@@ -967,7 +961,6 @@ static int ehea_poll(struct napi_struct *napi, int budget)
 		rx += ehea_proc_rwqes(dev, pr, budget - rx);
 	}
 
-	pr->poll_counter++;
 	return rx;
 }