commit ebe0edc3d48e2d3409e59433f4dbf5db4d20030f
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 20 05:23:38 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 20 05:23:38 2015 -0700
tree 5801ed3ce690dbeaa2fc72dd46b51316043a5348
parent c16ee484752e06ccbfeb9872d252d4dd6a024302
parent a686018c15c59f70fd1ed563d26ba94ab88243a6

Merge "[qca-nss-drv]: using if_rx_msg_callback instead of virt_rx_msg_callback"

nss_tx_rx_virt_if.c

diff --git a/nss_tx_rx_virt_if.c b/nss_tx_rx_virt_if.c
index bd59d4e..87e7e6d 100644
--- a/nss_tx_rx_virt_if.c
+++ b/nss_tx_rx_virt_if.c
@@ -119,7 +119,7 @@
 	 * to the same callback/app_data.
 	 */
 	if (ncm->response == NSS_CMM_RESPONSE_NOTIFY) {
-		ncm->cb = (uint32_t)nss_ctx->nss_top->virt_if_msg_callback[ncm->interface];
+		ncm->cb = (uint32_t)nss_ctx->nss_top->if_rx_msg_callback[ncm->interface];
 		ncm->app_data = (uint32_t)nss_ctx->nss_top->subsys_dp_register[ncm->interface].ndev;
 	}
 
@@ -180,6 +180,8 @@
 	nss_top_main.subsys_dp_register[if_num].app_data = NULL;
 	nss_top_main.subsys_dp_register[if_num].features = (uint32_t)netdev->features;
 
+	nss_top_main.if_rx_msg_callback[if_num] = NULL;
+
 	return ctx;
 }
 

nss_virt_if.c

diff --git a/nss_virt_if.c b/nss_virt_if.c
index 92b80e8..8a14d63 100644
--- a/nss_virt_if.c
+++ b/nss_virt_if.c
@@ -117,7 +117,7 @@
 	 * to the same callback/app_data.
 	 */
 	if (ncm->response == NSS_CMM_RESPONSE_NOTIFY) {
-		ncm->cb = (uint32_t)nss_ctx->nss_top->virt_if_msg_callback[ncm->interface];
+		ncm->cb = (uint32_t)nss_ctx->nss_top->if_rx_msg_callback[ncm->interface];
 		ncm->app_data = (uint32_t)nss_ctx->nss_top->subsys_dp_register[ncm->interface].ndev;
 	}
 
@@ -887,6 +887,8 @@
 	nss_top_main.subsys_dp_register[if_num].cb = data_callback;
 	nss_top_main.subsys_dp_register[if_num].app_data = NULL;
 	nss_top_main.subsys_dp_register[if_num].features = (uint32_t)netdev->features;
+
+	nss_top_main.if_rx_msg_callback[if_num] = NULL;
 }
 EXPORT_SYMBOL(nss_virt_if_register);