Apply patch of SPF11.3.CSU1
Change-Id: I672ea5d6128cbf1ab8cc431e06984e6a55067f67
diff --git a/nss_ipv4.c b/nss_ipv4.c
index 4c4ae7e..579bc44 100644
--- a/nss_ipv4.c
+++ b/nss_ipv4.c
@@ -84,12 +84,12 @@
* Sanity check the message type
*/
if (ncm->type >= NSS_IPV4_MAX_MSG_TYPES) {
- nss_warning("%p: message type out of range: %d", nss_ctx, ncm->type);
+ nss_warning("%px: message type out of range: %d", nss_ctx, ncm->type);
return;
}
if (nss_cmn_get_msg_len(ncm) > sizeof(struct nss_ipv4_msg)) {
- nss_warning("%p: message length is invalid: %d", nss_ctx, nss_cmn_get_msg_len(ncm));
+ nss_warning("%px: message length is invalid: %d", nss_ctx, nss_cmn_get_msg_len(ncm));
return;
}
@@ -221,7 +221,7 @@
nim.msg.inquiry.rr.tuple = *ipv4_5t_p;
nss_tx_status = nss_ipv4_tx(nss_ctx, &nim);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: Send inquiry message failed\n", ipv4_5t_p);
+ nss_warning("%px: Send inquiry message failed\n", ipv4_5t_p);
}
return nss_tx_status;
@@ -240,12 +240,12 @@
* Sanity check the message
*/
if (ncm->interface != NSS_IPV4_RX_INTERFACE) {
- nss_warning("%p: tx request for another interface: %d", nss_ctx, ncm->interface);
+ nss_warning("%px: tx request for another interface: %d", nss_ctx, ncm->interface);
return NSS_TX_FAILURE;
}
if (ncm->type >= NSS_IPV4_MAX_MSG_TYPES) {
- nss_warning("%p: message type out of range: %d", nss_ctx, ncm->type);
+ nss_warning("%px: message type out of range: %d", nss_ctx, ncm->type);
return NSS_TX_FAILURE;
}
@@ -286,14 +286,14 @@
status = nss_ipv4_tx(nss_ctx, nim);
if (status != NSS_TX_SUCCESS) {
- nss_warning("%p: nss ipv4 msg tx failed\n", nss_ctx);
+ nss_warning("%px: nss ipv4 msg tx failed\n", nss_ctx);
up(&nss_ipv4_pvt.sem);
return status;
}
ret = wait_for_completion_timeout(&nss_ipv4_pvt.complete, msecs_to_jiffies(NSS_IPV4_TX_MSG_TIMEOUT));
if (!ret) {
- nss_warning("%p: IPv4 tx sync failed due to timeout\n", nss_ctx);
+ nss_warning("%px: IPv4 tx sync failed due to timeout\n", nss_ctx);
nss_ipv4_pvt.response = NSS_TX_FAILURE;
}
@@ -396,14 +396,14 @@
struct nss_ctx_instance *nss_ctx __maybe_unused = nss_ipv4_get_mgr();
if (nim->cm.response != NSS_CMN_RESPONSE_ACK) {
- nss_warning("%p: IPv4 connection configuration failed with error: %d\n", nss_ctx, nim->cm.error);
+ nss_warning("%px: IPv4 connection configuration failed with error: %d\n", nss_ctx, nim->cm.error);
nss_core_update_max_ipv4_conn(NSS_FW_DEFAULT_NUM_CONN);
nss_ipv4_free_conn_tables();
return;
}
nss_ipv4_conn_cfg = ntohl(nirccm->num_conn);
- nss_info("%p: IPv4 connection configuration success: %d\n", nss_ctx, nim->cm.error);
+ nss_info("%px: IPv4 connection configuration success: %d\n", nss_ctx, nim->cm.error);
}
/*
@@ -417,17 +417,17 @@
nss_tx_status_t nss_tx_status;
if ((!nss_ipv4_ct_info.ce_table_size) || (!nss_ipv4_ct_info.cme_table_size)) {
- nss_warning("%p: connection entry or connection match entry table size not available\n",
+ nss_warning("%px: connection entry or connection match entry table size not available\n",
nss_ctx);
return -EINVAL;
}
- nss_info("%p: IPv4 supported connections: %d\n", nss_ctx, conn);
+ 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,
get_order(nss_ipv4_ct_info.ce_table_size));
if (!nss_ipv4_ct_info.ce_mem) {
- nss_warning("%p: Memory allocation failed for IPv4 Connections: %d\n",
+ nss_warning("%px: Memory allocation failed for IPv4 Connections: %d\n",
nss_ctx,
conn);
goto fail;
@@ -436,7 +436,7 @@
nss_ipv4_ct_info.cme_mem = __get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
get_order(nss_ipv4_ct_info.cme_table_size));
if (!nss_ipv4_ct_info.ce_mem) {
- nss_warning("%p: Memory allocation failed for IPv4 Connections: %d\n",
+ nss_warning("%px: Memory allocation failed for IPv4 Connections: %d\n",
nss_ctx,
conn);
goto fail;
@@ -450,19 +450,19 @@
nirccm->num_conn = htonl(conn);
nirccm->ce_mem = dma_map_single(nss_ctx->dev, (void *)nss_ipv4_ct_info.ce_mem, nss_ipv4_ct_info.ce_table_size, DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(nss_ctx->dev, nirccm->ce_mem))) {
- nss_warning("%p: DMA mapping failed for virtual address = %p", nss_ctx, (void *)nss_ipv4_ct_info.ce_mem);
+ nss_warning("%px: DMA mapping failed for virtual address = %px", nss_ctx, (void *)nss_ipv4_ct_info.ce_mem);
goto fail;
}
nirccm->cme_mem = dma_map_single(nss_ctx->dev, (void *)nss_ipv4_ct_info.cme_mem, nss_ipv4_ct_info.cme_table_size, DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(nss_ctx->dev, nirccm->cme_mem))) {
- nss_warning("%p: DMA mapping failed for virtual address = %p", nss_ctx, (void *)nss_ipv4_ct_info.cme_mem);
+ nss_warning("%px: DMA mapping failed for virtual address = %px", nss_ctx, (void *)nss_ipv4_ct_info.cme_mem);
goto fail;
}
nss_tx_status = nss_ipv4_tx(nss_ctx, &nim);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: nss_tx error setting IPv4 Connections: %d\n",
+ nss_warning("%px: nss_tx error setting IPv4 Connections: %d\n",
nss_ctx,
conn);
goto fail;
@@ -485,7 +485,7 @@
struct nss_ctx_instance *nss_ctx = nss_ipv4_get_mgr();
if (nim->cm.response != NSS_CMN_RESPONSE_ACK) {
- nss_warning("%p: IPv4 fetch connection info failed with error: %d\n", nss_ctx, nim->cm.error);
+ nss_warning("%px: IPv4 fetch connection info failed with error: %d\n", nss_ctx, nim->cm.error);
nss_core_update_max_ipv4_conn(NSS_FW_DEFAULT_NUM_CONN);
return;
}
@@ -496,7 +496,7 @@
nss_ipv4_ct_info.cme_table_size = ntohl(nircgts->cme_table_size);
if (nss_ipv4_conn_cfg_process(nss_ctx, ntohl(nircgts->num_conn)) != 0) {
- nss_warning("%p: IPv4 connection entry or connection match entry table size\
+ nss_warning("%px: IPv4 connection entry or connection match entry table size\
not available\n", nss_ctx);
}
@@ -522,7 +522,7 @@
* By default, NSS FW is configured with default number of connections.
*/
if (ipv4_num_conn == NSS_FW_DEFAULT_NUM_CONN) {
- nss_info("%p: Default number of connections (%d) already configured\n", nss_ctx, ipv4_num_conn);
+ nss_info("%px: Default number of connections (%d) already configured\n", nss_ctx, ipv4_num_conn);
return 0;
}
@@ -536,7 +536,7 @@
if ((ipv4_num_conn & NSS_NUM_CONN_QUANTA_MASK) ||
(sum_of_conn > NSS_MAX_TOTAL_NUM_CONN_IPV4_IPV6) ||
(ipv4_num_conn < NSS_MIN_NUM_CONN)) {
- nss_warning("%p: input supported connections (%d) does not adhere\
+ nss_warning("%px: input supported connections (%d) does not adhere\
specifications\n1) not multiple of 1024,\n2) is less than \
min val: %d, OR\n IPv4/6 total exceeds %d\n",
nss_ctx,
@@ -555,7 +555,7 @@
nss_tx_status = nss_ipv4_tx(nss_ctx, &nim);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: Send fetch connection info message failed\n", nss_ctx);
+ nss_warning("%px: Send fetch connection info message failed\n", nss_ctx);
return -EINVAL;
}
@@ -616,7 +616,7 @@
nss_tx_status = nss_ipv4_tx_sync(nss_ctx, &nim);
if (nss_tx_status != NSS_TX_SUCCESS) {
- nss_warning("%p: Send acceleration mode message failed\n", nss_ctx);
+ nss_warning("%px: Send acceleration mode message failed\n", nss_ctx);
nss_ipv4_accel_mode_cfg = current_value;
return -EIO;
}
@@ -665,7 +665,7 @@
status = nss_ipv4_tx_sync(nss_ctx, &nim);
if (status != NSS_TX_SUCCESS) {
- nss_warning("%p: ipv4 dscp2pri config message failed\n", nss_ctx);
+ nss_warning("%px: ipv4 dscp2pri config message failed\n", nss_ctx);
return -EFAULT;
}