qcacld-3.0: Enable ipv4/ipv6 address notification for NDI

qcacld-2.0 to qcacld-3.0 propagation

NAN Data Interface also supports ipv4 and ipv6 address notification
like any other netdev. Enable ipv4/ipv6 notifications for NDI mode.

Change-Id: I6ad281d9b3dce66db7bbfd198296d0d086ccf4fb
CRs-Fixed: 962367

core/hdd/inc/wlan_hdd_assoc.h

@@ -57,8 +57,8 @@
 
 /* Type Declarations */
 /**
- * typedef eConnectionState - Connection states
- * @eConnectionState_NotConnected: Not associated in Infra or participating
+ * enum eConnectionState - connection state values at HDD
+ * @eConnectionState_NotConnected: Not associated in Infra or participating in
  *			in an IBSS / Ad-hoc network
  * @eConnectionState_Connecting: While connection in progress
  * @eConnectionState_Associated: Associated in an Infrastructure network
@@ -66,7 +66,9 @@
  *			disconnected (no partner stations in the IBSS)
  * @eConnectionState_IbssConnected: Participating in an IBSS network with
  *			partner stations also present
- * eConnectionState_Disconnecting: Disconnecting in an Infrastructure network
+ * @eConnectionState_Disconnecting: Disconnecting in an Infrastructure network.
+ * @eConnectionState_NdiDisconnected: NDI in disconnected state - no peers
+ * @eConnectionState_NdiConnected: NDI in connected state - at least one peer
  */
 typedef enum {
 	eConnectionState_NotConnected,
@@ -74,7 +76,9 @@ typedef enum {
 	eConnectionState_Associated,
 	eConnectionState_IbssDisconnected,
 	eConnectionState_IbssConnected,
-	eConnectionState_Disconnecting
+	eConnectionState_Disconnecting,
+	eConnectionState_NdiDisconnected,
+	eConnectionState_NdiConnected,
 } eConnectionState;
 
 /**

core/hdd/src/wlan_hdd_nan_datapath.h

@@ -40,6 +40,17 @@ struct wireless_dev;
 #define NDP_APP_INFO_LEN 255
 #define NDP_QOS_INFO_LEN 255
 
+#ifdef WLAN_FEATURE_NAN_DATAPATH
+#define WLAN_HDD_IS_NDI(adapter) ((adapter)->device_mode == QDF_NDI_MODE)
+
+#define WLAN_HDD_IS_NDI_CONNECTED(adapter) ( \
+	eConnectionState_NdiConnected ==\
+		(adapter)->sessionCtx.station.conn_info.connState)
+#else
+#define WLAN_HDD_IS_NDI(adapter)	(false)
+#define WLAN_HDD_IS_NDI_CONNECTED(adapter) (false)
+#endif /* WLAN_FEATURE_NAN_DATAPATH */
+
 /**
  * enum qca_wlan_vendor_attr_ndp_params - vendor attribute parameters
  * @QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD: NDP Sub command

core/hdd/src/wlan_hdd_power.c

@@ -266,7 +266,8 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
 
 	if ((pAdapter->dev == ndev) &&
 		(pAdapter->device_mode == QDF_STA_MODE ||
-		pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) {
+		pAdapter->device_mode == QDF_P2P_CLIENT_MODE ||
+		pAdapter->device_mode == QDF_NDI_MODE)) {
 		pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 		status = wlan_hdd_validate_context(pHddCtx);
 		if (0 != status)
@@ -482,6 +483,7 @@ void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
 		container_of(work, hdd_adapter_t, ipv6NotifierWorkQueue);
 	hdd_context_t *pHddCtx;
 	int status;
+	bool ndi_connected = false;
 
 	ENTER();
 
@@ -501,8 +503,13 @@ void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
 		pHddCtx->sus_res_mcastbcast_filter_valid = true;
 	}
 
-	if ((eConnectionState_Associated ==
-	     (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState))
+	/* check if the device is in NAN data mode */
+	if (WLAN_HDD_IS_NDI(pAdapter))
+		ndi_connected = WLAN_HDD_IS_NDI_CONNECTED(pAdapter);
+
+	if (eConnectionState_Associated ==
+	     (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState ||
+		ndi_connected)
 		if (pHddCtx->config->fhostNSOffload)
 			hdd_conf_ns_offload(pAdapter, true);
 	EXIT();
@@ -593,6 +600,7 @@ void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
 		container_of(work, hdd_adapter_t, ipv4NotifierWorkQueue);
 	hdd_context_t *pHddCtx;
 	int status;
+	bool ndi_connected = false;
 
 	hdd_info("Configuring ARP Offload");
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -611,8 +619,18 @@ void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
 		pHddCtx->sus_res_mcastbcast_filter_valid = true;
 	}
 
-	if ((eConnectionState_Associated ==
-	     (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState))
+	/* check if the device is in NAN data mode */
+	if (WLAN_HDD_IS_NDI(pAdapter))
+		ndi_connected = WLAN_HDD_IS_NDI_CONNECTED(pAdapter);
+
+	if (eConnectionState_Associated ==
+	     (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState ||
+		ndi_connected)
+		/*
+		 * This invocation being part of the IPv4 registration callback,
+		 * we are passing second parameter as 2 to avoid registration
+		 * of IPv4 notifier again.
+		 */
 		hdd_conf_arp_offload(pAdapter, true);
 }
 
@@ -663,7 +681,8 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
 
 	if ((pAdapter && pAdapter->dev == ndev) &&
 		(pAdapter->device_mode == QDF_STA_MODE ||
-		pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) {
+		pAdapter->device_mode == QDF_P2P_CLIENT_MODE ||
+		pAdapter->device_mode == QDF_NDI_MODE)) {
 
 		pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 		status = wlan_hdd_validate_context(pHddCtx);