leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qlge: Remove dynamic alloc of rx ring control blocks.

Browse Source 
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ron Mercer 2009-01-09 11:31:53 +00:00 committed by David S. Miller
parent 0857e9d73f
commit 683d46a979
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/qlge/qlge.h
View File

@ -30,8 +30,9 @@
#define QLGE_VENDOR_ID 0x1077 #define QLGE_VENDOR_ID 0x1077
#define QLGE_DEVICE_ID 0x8012 #define QLGE_DEVICE_ID 0x8012
#define MAX_RX_RINGS 128 #define MAX_CPUS 8
#define MAX_TX_RINGS 128 #define MAX_TX_RINGS MAX_CPUS
#define MAX_RX_RINGS ((MAX_CPUS * 2) + 1)
#define NUM_TX_RING_ENTRIES 256 #define NUM_TX_RING_ENTRIES 256
#define NUM_RX_RING_ENTRIES 256 #define NUM_RX_RING_ENTRIES 256
@ -44,6 +45,7 @@
#define MAX_SPLIT_SIZE 1023 #define MAX_SPLIT_SIZE 1023
#define QLGE_SB_PAD 32 #define QLGE_SB_PAD 32
#define MAX_CQ 128
#define DFLT_COALESCE_WAIT 100 /* 100 usec wait for coalescing */ #define DFLT_COALESCE_WAIT 100 /* 100 usec wait for coalescing */
#define MAX_INTER_FRAME_WAIT 10 /* 10 usec max interframe-wait for coalescing */ #define MAX_INTER_FRAME_WAIT 10 /* 10 usec max interframe-wait for coalescing */
#define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT/2) #define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT/2)
@ -1393,9 +1395,11 @@ struct ql_adapter {
int rx_ring_count; int rx_ring_count;
int ring_mem_size; int ring_mem_size;
void *ring_mem; void *ring_mem;
struct rx_ring *rx_ring;
struct rx_ring rx_ring[MAX_RX_RINGS];
struct tx_ring tx_ring[MAX_TX_RINGS];
int rx_csum; int rx_csum;
struct tx_ring *tx_ring;
u32 default_rx_queue; u32 default_rx_queue;
u16 rx_coalesce_usecs; /* cqicb->int_delay */ u16 rx_coalesce_usecs; /* cqicb->int_delay */

31
drivers/net/qlge/qlge_main.c
View File

@ -2355,28 +2355,6 @@ static void ql_tx_ring_clean(struct ql_adapter *qdev)
} }
} }
static void ql_free_ring_cb(struct ql_adapter *qdev)
{
kfree(qdev->ring_mem);
}
static int ql_alloc_ring_cb(struct ql_adapter *qdev)
{
/* Allocate space for tx/rx ring control blocks. */
qdev->ring_mem_size =
(qdev->tx_ring_count * sizeof(struct tx_ring)) +
(qdev->rx_ring_count * sizeof(struct rx_ring));
qdev->ring_mem = kmalloc(qdev->ring_mem_size, GFP_KERNEL);
if (qdev->ring_mem == NULL) {
return -ENOMEM;
} else {
qdev->rx_ring = qdev->ring_mem;
qdev->tx_ring = qdev->ring_mem +
(qdev->rx_ring_count * sizeof(struct rx_ring));
}
return 0;
}
static void ql_free_mem_resources(struct ql_adapter *qdev) static void ql_free_mem_resources(struct ql_adapter *qdev)
{ {
int i; int i;
@ -3236,7 +3214,6 @@ static int qlge_close(struct net_device *ndev)
msleep(1); msleep(1);
ql_adapter_down(qdev); ql_adapter_down(qdev);
ql_release_adapter_resources(qdev); ql_release_adapter_resources(qdev);
ql_free_ring_cb(qdev);
return 0; return 0;
} }
@ -3262,8 +3239,8 @@ static int ql_configure_rings(struct ql_adapter *qdev)
* This limitation can be removed when requested. * This limitation can be removed when requested.
*/ */
if (cpu_cnt > 8) if (cpu_cnt > MAX_CPUS)
cpu_cnt = 8; cpu_cnt = MAX_CPUS;
/* /*
* rx_ring[0] is always the default queue. * rx_ring[0] is always the default queue.
@ -3283,9 +3260,6 @@ static int ql_configure_rings(struct ql_adapter *qdev)
*/ */
qdev->rx_ring_count = qdev->tx_ring_count + qdev->rss_ring_count + 1; qdev->rx_ring_count = qdev->tx_ring_count + qdev->rss_ring_count + 1;
if (ql_alloc_ring_cb(qdev))
return -ENOMEM;
for (i = 0; i < qdev->tx_ring_count; i++) { for (i = 0; i < qdev->tx_ring_count; i++) {
tx_ring = &qdev->tx_ring[i]; tx_ring = &qdev->tx_ring[i];
memset((void *)tx_ring, 0, sizeof(tx_ring)); memset((void *)tx_ring, 0, sizeof(tx_ring));
@ -3382,7 +3356,6 @@ static int qlge_open(struct net_device *ndev)
error_up: error_up:
ql_release_adapter_resources(qdev); ql_release_adapter_resources(qdev);
ql_free_ring_cb(qdev);
return err; return err;
} }