Fixes for Linux 4.1

CONFIG_COMCERTO_ZONE_DMA_NCNB:
Optimus + Linux 3.2: CONFIG_COMCERTO_ZONE_DMA_NCNB=y
Optimus + Linux 4.1: CONFIG_COMCERTO_ZONE_DMA_NCNB not defined

SET_ETHTOOL_OPS:
This macro was removed in Linux 3.16.
SET_ETHTOOL_OPS(netdev,ops)  ( (netdev)->ethtool_ops = (ops) )

Change-Id: I59c8f84ee452d88718843fe38b3260e2926ad274
diff --git a/drivers/net/wireless/quantenna/pcie2/host/common/topaz_vnet.c b/drivers/net/wireless/quantenna/pcie2/host/common/topaz_vnet.c
index 4cf7f20..2b40404 100644
--- a/drivers/net/wireless/quantenna/pcie2/host/common/topaz_vnet.c
+++ b/drivers/net/wireless/quantenna/pcie2/host/common/topaz_vnet.c
@@ -830,7 +830,7 @@
 	}
 	spin_unlock(&vmp->rx_skb_freelist_lock);
 #else
-#ifdef CONFIG_ARCH_COMCERTO
+#ifdef CONFIG_COMCERTO_ZONE_DMA_NCNB
 	if (!(skb = __dev_alloc_skb(SKB_BUF_SIZE, GFP_ATOMIC | GFP_DMA_NCNB))) {
 #else
 	if (!(skb = dev_alloc_skb(SKB_BUF_SIZE))) {
@@ -1253,7 +1253,7 @@
 
 	ndev->netdev_ops = &vmac_device_ops;
 	ndev->tx_queue_len = QTN_GLOBAL_INIT_EMAC_TX_QUEUE_LEN;
-	SET_ETHTOOL_OPS(ndev, &vmac_ethtool_ops);
+	ndev->ethtool_ops = &vmac_ethtool_ops;
 
 	/* Initialize private data */
 	vmp = netdev_priv(ndev);