Apply patch from SPF11.3.CSU1 to SPF11.4.CS
Change-Id: I010d3d627813b64cc27abaf6db06c80a64fe34d0
diff --git a/nss_ipv4.c b/nss_ipv4.c
index 579bc44..d75d411 100644
--- a/nss_ipv4.c
+++ b/nss_ipv4.c
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -424,7 +424,7 @@
nss_info("%px: IPv4 supported connections: %d\n", nss_ctx, conn);
- nss_ipv4_ct_info.ce_mem = __get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+ nss_ipv4_ct_info.ce_mem = __get_free_pages(GFP_ATOMIC | __GFP_NOWARN | __GFP_ZERO,
get_order(nss_ipv4_ct_info.ce_table_size));
if (!nss_ipv4_ct_info.ce_mem) {
nss_warning("%px: Memory allocation failed for IPv4 Connections: %d\n",
@@ -433,7 +433,7 @@
goto fail;
}
- nss_ipv4_ct_info.cme_mem = __get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+ nss_ipv4_ct_info.cme_mem = __get_free_pages(GFP_ATOMIC | __GFP_NOWARN | __GFP_ZERO,
get_order(nss_ipv4_ct_info.cme_table_size));
if (!nss_ipv4_ct_info.ce_mem) {
nss_warning("%px: Memory allocation failed for IPv4 Connections: %d\n",