From 77b472a0d1d7a039ea2c522bfa8be65d10490fba Mon Sep 17 00:00:00 2001 From: Santiago Leon Date: Fri, 3 Sep 2010 18:28:09 +0000 Subject: [PATCH] --- yaml --- r: 214303 b: refs/heads/master c: c033a6d1390bb6cc0c11c3b4137b856dfd8cb7c8 h: refs/heads/master i: 214301: 84081d8eb7c89c9607ffbb668e18a2db76af6cb7 214299: b4f2fc440e2cc096e02a871cc5340d313e07db82 214295: 250f20e92048361cd03b1cabc9055075120f32e0 214287: 6e6a513c73f70aef68abe100905749d5a29fc365 214271: c03747311e2bf6d23de11c097076cb92fad831da v: v3 --- [refs] | 2 +- trunk/drivers/net/ibmveth.c | 13 ++++++++----- trunk/drivers/net/ibmveth.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3ee13d192d67..940808647900 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a613f581489aff23189c4945aec9567f6663b0c6 +refs/heads/master: c033a6d1390bb6cc0c11c3b4137b856dfd8cb7c8 diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c index d2cc6d3f401c..3515ef318eb0 100644 --- a/trunk/drivers/net/ibmveth.c +++ b/trunk/drivers/net/ibmveth.c @@ -178,7 +178,7 @@ static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool, u32 pool_in pool->size = pool_size; pool->index = pool_index; pool->buff_size = buff_size; - pool->threshold = pool_size / 2; + pool->threshold = pool_size * 7 / 8; pool->active = pool_active; } @@ -315,10 +315,13 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter) adapter->replenish_task_cycles++; - for (i = (IbmVethNumBufferPools - 1); i >= 0; i--) - if(adapter->rx_buff_pool[i].active) - ibmveth_replenish_buffer_pool(adapter, - &adapter->rx_buff_pool[i]); + for (i = (IbmVethNumBufferPools - 1); i >= 0; i--) { + struct ibmveth_buff_pool *pool = &adapter->rx_buff_pool[i]; + + if (pool->active && + (atomic_read(&pool->available) < pool->threshold)) + ibmveth_replenish_buffer_pool(adapter, pool); + } adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr) + 4096 - 8); } diff --git a/trunk/drivers/net/ibmveth.h b/trunk/drivers/net/ibmveth.h index ec76ace66c6b..f3ede8184b6d 100644 --- a/trunk/drivers/net/ibmveth.h +++ b/trunk/drivers/net/ibmveth.h @@ -102,7 +102,7 @@ static inline long h_illan_attributes(unsigned long unit_address, #define IBMVETH_MAX_BUF_SIZE (1024 * 128) static int pool_size[] = { 512, 1024 * 2, 1024 * 16, 1024 * 32, 1024 * 64 }; -static int pool_count[] = { 256, 768, 256, 256, 256 }; +static int pool_count[] = { 256, 512, 256, 256, 256 }; static int pool_active[] = { 1, 1, 0, 0, 0}; #define IBM_VETH_INVALID_MAP ((u16)0xffff)