diff options
author | Ravikiran G Thirumalai <kiran@scalex86.org> | 2005-10-28 18:14:49 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 19:06:43 -0400 |
commit | a7ec15da65ab64c5f97beedc4ff21cf3e0ae71c0 (patch) | |
tree | 05cb18e46286e5343a795c71890115a59e8c30bf | |
parent | 46e178535836dcd7ef92f179218628d101892c59 (diff) |
[PATCH] e1000: use vmalloc_node()
Allocate node local tx and rx descriptors for the e1000 driver
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index a0023f357cb1..d97ad89f5dd2 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -1149,7 +1149,8 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter, | |||
1149 | int size; | 1149 | int size; |
1150 | 1150 | ||
1151 | size = sizeof(struct e1000_buffer) * txdr->count; | 1151 | size = sizeof(struct e1000_buffer) * txdr->count; |
1152 | txdr->buffer_info = vmalloc(size); | 1152 | |
1153 | txdr->buffer_info = vmalloc_node(size, pcibus_to_node(pdev->bus)); | ||
1153 | if(!txdr->buffer_info) { | 1154 | if(!txdr->buffer_info) { |
1154 | DPRINTK(PROBE, ERR, | 1155 | DPRINTK(PROBE, ERR, |
1155 | "Unable to allocate memory for the transmit descriptor ring\n"); | 1156 | "Unable to allocate memory for the transmit descriptor ring\n"); |
@@ -1366,7 +1367,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter, | |||
1366 | int size, desc_len; | 1367 | int size, desc_len; |
1367 | 1368 | ||
1368 | size = sizeof(struct e1000_buffer) * rxdr->count; | 1369 | size = sizeof(struct e1000_buffer) * rxdr->count; |
1369 | rxdr->buffer_info = vmalloc(size); | 1370 | rxdr->buffer_info = vmalloc_node(size, pcibus_to_node(pdev->bus)); |
1370 | if (!rxdr->buffer_info) { | 1371 | if (!rxdr->buffer_info) { |
1371 | DPRINTK(PROBE, ERR, | 1372 | DPRINTK(PROBE, ERR, |
1372 | "Unable to allocate memory for the receive descriptor ring\n"); | 1373 | "Unable to allocate memory for the receive descriptor ring\n"); |