From a3c4b4fb7ddd7413180046edc9003e663957f57e Mon Sep 17 00:00:00 2001 From: Shreyas Bhatewara Date: Fri, 14 Jan 2011 14:59:25 +0000 Subject: [PATCH] --- yaml --- r: 231902 b: refs/heads/master c: a53255d38e6d08453373ac0b7256d40395b202ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 769b7ec3a7a7..9b46c05edc0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01a859014b35deb6cc63b1dc2808ca7a0e10a4de +refs/heads/master: a53255d38e6d08453373ac0b7256d40395b202ba diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c index d143e8b72b5b..562bdbb01507 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2426,7 +2426,7 @@ vmxnet3_adjust_rx_ring_size(struct vmxnet3_adapter *adapter) sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN; ring0_size = adapter->rx_queue[0].rx_ring[0].size; ring0_size = (ring0_size + sz - 1) / sz * sz; - ring0_size = min_t(u32, rq->rx_ring[0].size, VMXNET3_RX_RING_MAX_SIZE / + ring0_size = min_t(u32, ring0_size, VMXNET3_RX_RING_MAX_SIZE / sz * sz); ring1_size = adapter->rx_queue[0].rx_ring[1].size; comp_size = ring0_size + ring1_size;