Apply patch of SPF11.3.CSU1
Change-Id: I672ea5d6128cbf1ab8cc431e06984e6a55067f67
diff --git a/nss_rps.c b/nss_rps.c
index a54c08a..59a4e72 100644
--- a/nss_rps.c
+++ b/nss_rps.c
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2013-2017, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2017, 2019-2020 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.
@@ -188,12 +188,12 @@
*/
nss_rps_cfg_pvt.response = NSS_FAILURE;
complete(&nss_rps_cfg_pvt.complete);
- nss_warning("%p: RPS configuration failed : %d\n", nss_ctx,
+ nss_warning("%px: RPS configuration failed : %d\n", nss_ctx,
nnm->cm.error);
return;
}
- nss_info("%p: RPS configuration succeeded: %d\n", nss_ctx,
+ nss_info("%px: RPS configuration succeeded: %d\n", nss_ctx,
nnm->cm.error);
nss_ctx->rps_en = nnm->msg.rps_cfg.enable;
nss_rps_cfg_pvt.response = NSS_SUCCESS;
@@ -215,12 +215,12 @@
*/
nss_rps_cfg_pvt.response = NSS_FAILURE;
complete(&nss_rps_cfg_pvt.complete);
- nss_warning("%p: RPS pri_map configuration failed : %d\n",
+ nss_warning("%px: RPS pri_map configuration failed : %d\n",
app_data, nnm->cm.error);
return;
}
- nss_info("%p: RPS pri_map configuration succeeded: %d\n",
+ nss_info("%px: RPS pri_map configuration succeeded: %d\n",
app_data, nnm->cm.error);
nss_rps_cfg_pvt.response = NSS_SUCCESS;
@@ -248,7 +248,7 @@
nss_tx_status = nss_n2h_tx_msg(nss_ctx, &nnm);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: nss_tx error setting rps\n", nss_ctx);
+ nss_warning("%px: nss_tx error setting rps\n", nss_ctx);
up(&nss_rps_cfg_pvt.sem);
return NSS_FAILURE;
@@ -259,7 +259,7 @@
*/
ret = wait_for_completion_timeout(&nss_rps_cfg_pvt.complete, msecs_to_jiffies(NSS_CONN_CFG_TIMEOUT));
if (ret == 0) {
- nss_warning("%p: Waiting for ack timed out\n", nss_ctx);
+ nss_warning("%px: Waiting for ack timed out\n", nss_ctx);
up(&nss_rps_cfg_pvt.sem);
return NSS_FAILURE;
}
@@ -297,7 +297,7 @@
nss_tx_status = nss_ipv4_tx_sync(nss_ctx, &nim);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: nss_tx error setting rps\n", nss_ctx);
+ nss_warning("%px: nss_tx error setting rps\n", nss_ctx);
up(&nss_rps_cfg_pvt.sem);
return NSS_FAILURE;
@@ -326,7 +326,7 @@
nss_tx_status = nss_ipv6_tx_sync(nss_ctx, &nim);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: nss_tx error setting rps\n", nss_ctx);
+ nss_warning("%px: nss_tx error setting rps\n", nss_ctx);
up(&nss_rps_cfg_pvt.sem);
return NSS_FAILURE;
@@ -365,7 +365,7 @@
nss_tx_status = nss_n2h_tx_msg(nss_ctx, &nnm);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: nss_tx error setting rps\n", nss_ctx);
+ nss_warning("%px: nss_tx error setting rps\n", nss_ctx);
up(&nss_rps_cfg_pvt.sem);
return NSS_FAILURE;
@@ -376,7 +376,7 @@
*/
ret = wait_for_completion_timeout(&nss_rps_cfg_pvt.complete, msecs_to_jiffies(NSS_CONN_CFG_TIMEOUT));
if (ret == 0) {
- nss_warning("%p: Waiting for ack timed out\n", nss_ctx);
+ nss_warning("%px: Waiting for ack timed out\n", nss_ctx);
up(&nss_rps_cfg_pvt.sem);
return NSS_FAILURE;
}
@@ -438,7 +438,7 @@
* TODO: Flush queues in NSS FW.
*/
if (ret_rps != NSS_SUCCESS) {
- nss_warning("%p: rps enabling failed\n", nss_ctx);
+ nss_warning("%px: rps enabling failed\n", nss_ctx);
nss_rps_config = current_state;
return ret_rps;
}
@@ -474,7 +474,7 @@
ret_ipv4 = nss_rps_ipv4_hash_bitmap_cfg(nss_ctx, nss_rps_hash_bitmap);
if (ret_ipv4 != NSS_SUCCESS) {
- nss_warning("%p: ipv4 hash_bitmap config message failed\n", nss_ctx);
+ nss_warning("%px: ipv4 hash_bitmap config message failed\n", nss_ctx);
nss_rps_hash_bitmap = current_state;
return ret_ipv4;
}
@@ -482,10 +482,10 @@
ret_ipv6 = nss_rps_ipv6_hash_bitmap_cfg(nss_ctx, nss_rps_hash_bitmap);
if (ret_ipv6 != NSS_SUCCESS) {
- nss_warning("%p: ipv6 hash_bitmap config message failed\n", nss_ctx);
+ nss_warning("%px: ipv6 hash_bitmap config message failed\n", nss_ctx);
nss_rps_hash_bitmap = current_state;
if (nss_rps_ipv4_hash_bitmap_cfg(nss_ctx, nss_rps_hash_bitmap != NSS_SUCCESS)) {
- nss_warning("%p: ipv4 and ipv6 have different hash_bitmaps.\n", nss_ctx);
+ nss_warning("%px: ipv4 and ipv6 have different hash_bitmaps.\n", nss_ctx);
}
return ret_ipv6;
}
@@ -526,7 +526,7 @@
ret_pri_map = nss_rps_pri_map_cfg(nss_ctx, nss_rps_pri_map);
if (ret_pri_map != NSS_SUCCESS) {
nss_rps_pri_map[current_state.pri] = current_state.core;
- nss_warning("%p: pri_map config message failed\n", nss_ctx);
+ nss_warning("%px: pri_map config message failed\n", nss_ctx);
}
return ret_pri_map;