diff options
author | Jan Glauber <jang@linux.vnet.ibm.com> | 2011-10-30 10:17:08 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-10-30 10:16:45 -0400 |
commit | 6ffed94ea73c0c15e3201d4d479b6efe8343fb96 (patch) | |
tree | 91696f021d3301fd1d76d2e26c6e9ecc7bd0d283 /drivers | |
parent | 2768b2ded129ee92a8f8bf9049983c6b37ed44bf (diff) |
[S390] qdio: remove multicast polling
The multicast poll check for the outbound queue is redundant since
3d6c76f "[S390] qdio: outbound tasklet scan threshold". Remove the check.
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/cio/qdio.h | 8 | ||||
-rw-r--r-- | drivers/s390/cio/qdio_main.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h index c15624b76907..498a4cd99ff8 100644 --- a/drivers/s390/cio/qdio.h +++ b/drivers/s390/cio/qdio.h | |||
@@ -18,14 +18,6 @@ | |||
18 | #define QDIO_BUSY_BIT_RETRIES 1000 /* = 10s retry time */ | 18 | #define QDIO_BUSY_BIT_RETRIES 1000 /* = 10s retry time */ |
19 | #define QDIO_INPUT_THRESHOLD (500 << 12) /* 500 microseconds */ | 19 | #define QDIO_INPUT_THRESHOLD (500 << 12) /* 500 microseconds */ |
20 | 20 | ||
21 | /* | ||
22 | * if an asynchronous HiperSockets queue runs full, the 10 seconds timer wait | ||
23 | * till next initiative to give transmitted skbs back to the stack is too long. | ||
24 | * Therefore polling is started in case of multicast queue is filled more | ||
25 | * than 50 percent. | ||
26 | */ | ||
27 | #define QDIO_IQDIO_POLL_LVL 65 /* HS multicast queue */ | ||
28 | |||
29 | enum qdio_irq_states { | 21 | enum qdio_irq_states { |
30 | QDIO_IRQ_STATE_INACTIVE, | 22 | QDIO_IRQ_STATE_INACTIVE, |
31 | QDIO_IRQ_STATE_ESTABLISHED, | 23 | QDIO_IRQ_STATE_ESTABLISHED, |
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index 5ec5317f7903..ab9de1be77a3 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c | |||
@@ -921,10 +921,6 @@ static void __qdio_outbound_processing(struct qdio_q *q) | |||
921 | if (!pci_out_supported(q) && !qdio_outbound_q_done(q)) | 921 | if (!pci_out_supported(q) && !qdio_outbound_q_done(q)) |
922 | goto sched; | 922 | goto sched; |
923 | 923 | ||
924 | if ((queue_type(q) == QDIO_IQDIO_QFMT) && | ||
925 | (atomic_read(&q->nr_buf_used)) > QDIO_IQDIO_POLL_LVL) | ||
926 | goto sched; | ||
927 | |||
928 | if (q->u.out.pci_out_enabled) | 924 | if (q->u.out.pci_out_enabled) |
929 | return; | 925 | return; |
930 | 926 | ||