diff options
author | Hariprasad Shenai <hariprasad@chelsio.com> | 2015-04-14 16:32:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-14 15:08:52 -0400 |
commit | d52ce9203746254e010dc7f0f3c260d5a5f4b640 (patch) | |
tree | 28f2ec985051cbf1046d208af5601c201c27cbc2 | |
parent | c098b026f075ea34f70d669a84c71cc55fdeb37c (diff) |
cxgb4: Use device node in page allocation
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c index e0cfce88890f..6af4bab6059c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c | |||
@@ -592,8 +592,10 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n, | |||
592 | unsigned int cred = q->avail; | 592 | unsigned int cred = q->avail; |
593 | __be64 *d = &q->desc[q->pidx]; | 593 | __be64 *d = &q->desc[q->pidx]; |
594 | struct rx_sw_desc *sd = &q->sdesc[q->pidx]; | 594 | struct rx_sw_desc *sd = &q->sdesc[q->pidx]; |
595 | int node; | ||
595 | 596 | ||
596 | gfp |= __GFP_NOWARN; | 597 | gfp |= __GFP_NOWARN; |
598 | node = dev_to_node(adap->pdev_dev); | ||
597 | 599 | ||
598 | if (s->fl_pg_order == 0) | 600 | if (s->fl_pg_order == 0) |
599 | goto alloc_small_pages; | 601 | goto alloc_small_pages; |
@@ -602,7 +604,7 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n, | |||
602 | * Prefer large buffers | 604 | * Prefer large buffers |
603 | */ | 605 | */ |
604 | while (n) { | 606 | while (n) { |
605 | pg = __dev_alloc_pages(gfp, s->fl_pg_order); | 607 | pg = alloc_pages_node(node, gfp | __GFP_COMP, s->fl_pg_order); |
606 | if (unlikely(!pg)) { | 608 | if (unlikely(!pg)) { |
607 | q->large_alloc_failed++; | 609 | q->large_alloc_failed++; |
608 | break; /* fall back to single pages */ | 610 | break; /* fall back to single pages */ |
@@ -632,7 +634,7 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n, | |||
632 | 634 | ||
633 | alloc_small_pages: | 635 | alloc_small_pages: |
634 | while (n--) { | 636 | while (n--) { |
635 | pg = __dev_alloc_page(gfp); | 637 | pg = alloc_pages_node(node, gfp, 0); |
636 | if (unlikely(!pg)) { | 638 | if (unlikely(!pg)) { |
637 | q->alloc_failed++; | 639 | q->alloc_failed++; |
638 | break; | 640 | break; |