From a81f7eace0c758dafe78b5a8745260abdd5fe04f Mon Sep 17 00:00:00 2001 From: Jan Glauber Date: Sun, 30 Oct 2011 15:17:08 +0100 Subject: [PATCH] --- yaml --- r: 272087 b: refs/heads/master c: 6ffed94ea73c0c15e3201d4d479b6efe8343fb96 h: refs/heads/master i: 272085: 13ef0510ecca33885118f6000fbe061dd5b365ed 272083: 2906e8749c0c58f19a5d31429752f718d96b7279 272079: 9214829e4b4d2280a4a576ec47b6388f3019b93a v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/qdio.h | 8 -------- trunk/drivers/s390/cio/qdio_main.c | 4 ---- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 207b157e14b6..88e0801af46d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2768b2ded129ee92a8f8bf9049983c6b37ed44bf +refs/heads/master: 6ffed94ea73c0c15e3201d4d479b6efe8343fb96 diff --git a/trunk/drivers/s390/cio/qdio.h b/trunk/drivers/s390/cio/qdio.h index c15624b76907..498a4cd99ff8 100644 --- a/trunk/drivers/s390/cio/qdio.h +++ b/trunk/drivers/s390/cio/qdio.h @@ -18,14 +18,6 @@ #define QDIO_BUSY_BIT_RETRIES 1000 /* = 10s retry time */ #define QDIO_INPUT_THRESHOLD (500 << 12) /* 500 microseconds */ -/* - * if an asynchronous HiperSockets queue runs full, the 10 seconds timer wait - * till next initiative to give transmitted skbs back to the stack is too long. - * Therefore polling is started in case of multicast queue is filled more - * than 50 percent. - */ -#define QDIO_IQDIO_POLL_LVL 65 /* HS multicast queue */ - enum qdio_irq_states { QDIO_IRQ_STATE_INACTIVE, QDIO_IRQ_STATE_ESTABLISHED, diff --git a/trunk/drivers/s390/cio/qdio_main.c b/trunk/drivers/s390/cio/qdio_main.c index 5ec5317f7903..ab9de1be77a3 100644 --- a/trunk/drivers/s390/cio/qdio_main.c +++ b/trunk/drivers/s390/cio/qdio_main.c @@ -921,10 +921,6 @@ static void __qdio_outbound_processing(struct qdio_q *q) if (!pci_out_supported(q) && !qdio_outbound_q_done(q)) goto sched; - if ((queue_type(q) == QDIO_IQDIO_QFMT) && - (atomic_read(&q->nr_buf_used)) > QDIO_IQDIO_POLL_LVL) - goto sched; - if (q->u.out.pci_out_enabled) return;