commit 7369b1fe012108e08705443975997a0e061920f1
author Linux Build Service Account <lnxbuild@localhost> Wed Aug 26 16:10:08 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 26 16:10:08 2015 -0700
tree e166d6faaef3f80deaac5531ae40e7cd4c8b859d
parent def14ce372b0d9d5b588b78710a07cc735f83472
parent 60f7e56bbdf82190188db0ffd06625424b36b3a4

Merge "[qca-nss-drv] Correct NETIF flags check"

nss_core.c

diff --git a/nss_core.c b/nss_core.c
index 00861d8..c73e3b8 100755
--- a/nss_core.c
+++ b/nss_core.c
@@ -437,7 +437,6 @@
 {
 	struct nss_top_instance *nss_top = nss_ctx->nss_top;
 	struct nss_subsystem_dataplane_register *subsys_dp_reg = &nss_top->subsys_dp_register[interface_num];
-	uint32_t netif_flags = subsys_dp_reg->features;
 	struct net_device *ndev = NULL;
 	nss_phys_if_rx_callback_t cb;
 
@@ -457,7 +456,7 @@
 		/*
 		 * Packet was received on Physical interface
 		 */
-		if (nss_core_skb_needs_linearize(nbuf, netif_flags) && __skb_linearize(nbuf)) {
+		if (nss_core_skb_needs_linearize(nbuf, ndev->features) && __skb_linearize(nbuf)) {
 			/*
 			 * We needed to linearize, but __skb_linearize() failed. So free the nbuf.
 			 */
@@ -479,7 +478,6 @@
 		 *
 		 * TODO: Change to gro receive later
 		 */
-		ndev = subsys_dp_reg->ndev;
 		if (ndev) {
 			dev_hold(ndev);
 			nbuf->dev = ndev;
@@ -512,7 +510,6 @@
 {
 	struct nss_top_instance *nss_top = nss_ctx->nss_top;
 	struct nss_subsystem_dataplane_register *subsys_dp_reg = &nss_top->subsys_dp_register[interface_num];
-	uint32_t netif_flags = subsys_dp_reg->features;
 	struct net_device *ndev = NULL;
 	nss_phys_if_rx_ext_data_callback_t ext_cb;
 
@@ -529,7 +526,7 @@
 	ndev = subsys_dp_reg->ndev;
 	ext_cb = subsys_dp_reg->ext_cb;
 	if (likely(ext_cb) && likely(ndev)) {
-		if (nss_core_skb_needs_linearize(nbuf, netif_flags) && __skb_linearize(nbuf)) {
+		if (nss_core_skb_needs_linearize(nbuf, ndev->features) && __skb_linearize(nbuf)) {
 			/*
 			 * We needed to linearize, but __skb_linearize() failed. So free the nbuf.
 			 */