diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2016-04-18 14:33:54 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-19 20:04:24 -0400 |
commit | 04aeb56a173282210c5dab5c9b3071fa3613806f (patch) | |
tree | 513eb72cba69ae4d875e8aeb21088e45ef1ce711 | |
parent | ab2ed0171a50ddee8390f472bb83f60d393b4b04 (diff) | |
download | linux-04aeb56a173282210c5dab5c9b3071fa3613806f.tar.gz linux-04aeb56a173282210c5dab5c9b3071fa3613806f.tar.bz2 linux-04aeb56a173282210c5dab5c9b3071fa3613806f.zip |
net/mlx4_en: allocate non 0-order pages for RX ring with __GFP_NOMEMALLOC
High order pages are optional here since commit 51151a16a60f ("mlx4: allow
order-0 memory allocations in RX path"), so here is no reason for depleting
reserves. Generic __netdev_alloc_frag() implements the same logic.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 86bcfe510e4e..56d070d9cf01 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -61,7 +61,7 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv, gfp_t gfp = _gfp; if (order) - gfp |= __GFP_COMP | __GFP_NOWARN; + gfp |= __GFP_COMP | __GFP_NOWARN | __GFP_NOMEMALLOC; page = alloc_pages(gfp, order); if (likely(page)) break; |