From f0c8ccd781c743f5062e36d46983167dd3d97e69 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Mon, 16 Jun 2008 19:57:40 +0200 Subject: [PATCH] --- yaml --- r: 103167 b: refs/heads/master c: f529932ce27e809e8c9bab5d744df5aef8a89157 h: refs/heads/master i: 103165: 67370f59ec650e69833588c9065dd5f69eb34a42 103163: cc8aedceb7e562de8df51bcfa1c6ffb61b79cfa9 103159: 1a0ba53dec40dc6616d2774e90d8731a57593fec 103151: 410216c8fa96906c990c163e03860270ce04aada 103135: b90ac659b9afb5225dadc4e0c6eca78b63b5f1f0 103103: 60872b707c01450770144fa47727b095da1b1a14 103039: 54e753403e7a736b2646e6111c90a58b5401f964 102911: fd685b985505f11f52ebddef945fb7e780b2eb6e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00queue.h | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d1dd66c3ddce..4ab63dede349 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1d35dfa0f7d75ba14c442143a9ad8e232d3edfb +refs/heads/master: f529932ce27e809e8c9bab5d744df5aef8a89157 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.h b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.h index 14ce8d4e1397..5dd9cca3c62c 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.h @@ -42,15 +42,18 @@ /** * DOC: Number of entries per queue * - * After research it was concluded that 12 entries in a RX and TX - * queue would be sufficient. Although this is almost one third of - * the amount the legacy driver allocated, the queues aren't getting - * filled to the maximum even when working with the maximum rate. + * Under normal load without fragmentation 12 entries are sufficient + * without the queue being filled up to the maximum. When using fragmentation + * and the queue threshold code we need to add some additional margins to + * make sure the queue will never (or only under extreme load) fill up + * completely. + * Since we don't use preallocated DMA having a large number of queue entries + * will have only minimal impact on the memory requirements for the queue. */ -#define RX_ENTRIES 12 -#define TX_ENTRIES 12 +#define RX_ENTRIES 24 +#define TX_ENTRIES 24 #define BEACON_ENTRIES 1 -#define ATIM_ENTRIES 1 +#define ATIM_ENTRIES 8 /** * enum data_queue_qid: Queue identification