diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:39:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:39:13 +0100 |
| commit | 17fa87fe5a5141d3c082c5c91e950aca9e0ec701 (patch) | |
| tree | 5aea2ff6b9b16b49585684c5f2ce404fe444a9ba /drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | |
| parent | checkkconfigsymbols.py: support Kconfig's 'imply' statement (diff) | |
| parent | Linux 4.10-rc7 (diff) | |
| download | linux-dev-17fa87fe5a5141d3c082c5c91e950aca9e0ec701.tar.xz linux-dev-17fa87fe5a5141d3c082c5c91e950aca9e0ec701.zip | |
Merge 4.10-rc7 into char-misc-next
We want the hv and other fixes in here as well to handle merge and
testing issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_rx.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 0e2fb3ed1790..06d5e6fecb0a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -193,6 +193,9 @@ static inline bool mlx5e_rx_cache_put(struct mlx5e_rq *rq, return false; } + if (unlikely(page_is_pfmemalloc(dma_info->page))) + return false; + cache->page_cache[cache->tail] = *dma_info; cache->tail = tail_next; return true; |