Registering IPv6 notifier to notify change in IP.
Not able to retrieve IPv6 addresses on the interface when
queried during the re-connection in suspend mode and thus
failing to set NS offload during SETSUSPEND.
Registering IPv6 notifier to get notification if any change
in IP, so that we can reconfigure the offload parameters for
new IP.
CRs-Fixed: 557306
Change-Id: Id90112f346349fe48aa36de104efb532433af2aa
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index e3fcca4..aedf294 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -791,6 +791,12 @@
/** Handle to the network device */
struct net_device *dev;
+
+#ifdef WLAN_NS_OFFLOAD
+ /** IPv6 notifier callback for handling NS offload on change in IP */
+ struct notifier_block ipv6_notifier;
+ struct work_struct ipv6NotifierWorkQueue;
+#endif
//TODO Move this to sta Ctx
struct wireless_dev wdev ;
@@ -1277,6 +1283,11 @@
#ifdef WLAN_FEATURE_PACKET_FILTERING
int wlan_hdd_setIPv6Filter(hdd_context_t *pHddCtx, tANI_U8 filterType, tANI_U8 sessionId);
#endif
+
+#ifdef WLAN_NS_OFFLOAD
+void hdd_ipv6_notifier_work_queue(struct work_struct *work);
+#endif
+
#ifdef CONFIG_ENABLE_LINUX_REG
void hdd_checkandupdate_phymode( hdd_context_t *pHddCtx);
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_power.h b/CORE/HDD/inc/wlan_hdd_power.h
index a1498a1..0810397 100644
--- a/CORE/HDD/inc/wlan_hdd_power.h
+++ b/CORE/HDD/inc/wlan_hdd_power.h
@@ -102,6 +102,6 @@
void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable);
#endif
#ifdef WLAN_NS_OFFLOAD
-void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable);
+void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, int fenable);
#endif
#endif // if !defined __WLAN_QCT_DRIVER_H
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 8e0651f..3d707bc 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -561,7 +561,63 @@
}
#ifdef WLAN_NS_OFFLOAD
-void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable)
+void hdd_ipv6_notifier_work_queue(struct work_struct *work)
+{
+ hdd_adapter_t* pAdapter =
+ container_of(work, hdd_adapter_t, ipv6NotifierWorkQueue);
+ hdd_context_t *pHddCtx;
+ int status;
+
+ hddLog(LOG1, FL("Reconfiguring NS Offload"));
+ pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ status = wlan_hdd_validate_context(pHddCtx);
+ if (0 != status)
+ {
+ hddLog(LOGE, FL("HDD context is invalid"));
+ return;
+ }
+
+ if (VOS_TRUE == pHddCtx->sus_res_mcastbcast_filter_valid)
+ {
+ // This invocation being part of the IPv6 registration callback,
+ // we are passing second parameter as 2 to avoid registration
+ // of IPv6 notifier again.
+ hdd_conf_ns_offload(pAdapter, 2);
+ }
+}
+
+static int wlan_hdd_ipv6_changed(struct notifier_block *nb,
+ unsigned long data, void *arg)
+{
+ struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)arg;
+ struct net_device *ndev = ifa->idev->dev;
+ hdd_adapter_t *pAdapter =
+ container_of(nb, struct hdd_adapter_s, ipv6_notifier);
+
+ if (pAdapter && pAdapter->dev == ndev)
+ {
+ schedule_work(&pAdapter->ipv6NotifierWorkQueue);
+ }
+
+ return NOTIFY_DONE;
+}
+
+/**----------------------------------------------------------------------------
+
+ \brief hdd_conf_ns_offload() - Configure NS offload
+
+ Called during SUSPEND to configure the NS offload (MC BC filter) which
+ reduces power consumption.
+
+ \param - pAdapter - Adapter context for which NS offload is to be configured
+ \param - fenable - 0 - disable.
+ 1 - enable. (with IPv6 notifier registration)
+ 2 - enable. (without IPv6 notifier registration)
+
+ \return - void
+
+ ---------------------------------------------------------------------------*/
+void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, int fenable)
{
struct inet6_dev *in6_dev;
struct inet6_ifaddr *ifp;
@@ -572,6 +628,7 @@
hdd_context_t *pHddCtx;
int i =0;
+ int ret =0;
eHalStatus returnStatus;
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -681,6 +738,18 @@
vos_mem_zero(&offLoadRequest, sizeof(offLoadRequest));
}
}
+ if (fenable == 1)
+ {
+ // Register IPv6 notifier to notify if any change in IP
+ // So that we can reconfigure the offload parameters
+ pAdapter->ipv6_notifier.notifier_call =
+ wlan_hdd_ipv6_changed;
+ ret = register_inet6addr_notifier(&pAdapter->ipv6_notifier);
+ if (ret)
+ {
+ hddLog(LOGE, FL("Failed to register IPv6 notifier"));
+ }
+ }
}
else
{
@@ -692,6 +761,7 @@
else
{
//Disable NSOffload
+ unregister_inet6addr_notifier(&pAdapter->ipv6_notifier);
vos_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq));
offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE;
offLoadRequest.offloadType = SIR_IPV6_NS_OFFLOAD;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index a7daaa9..07bfaa3 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5810,6 +5810,11 @@
hdd_deinit_adapter(pHddCtx, pAdapter);
goto err_free_netdev;
}
+
+#ifdef WLAN_NS_OFFLOAD
+ // Workqueue which gets scheduled in IPv6 notification callback.
+ INIT_WORK(&pAdapter->ipv6NotifierWorkQueue, hdd_ipv6_notifier_work_queue);
+#endif
//Stop the Interface TX queue.
netif_tx_disable(pAdapter->dev);
//netif_tx_disable(pWlanDev);
@@ -5909,7 +5914,6 @@
}
}
-
if( VOS_STATUS_SUCCESS == status )
{
//Add it to the hdd's session list.
@@ -6124,6 +6128,11 @@
{
hdd_abort_mac_scan(pHddCtx, pAdapter->sessionId);
}
+#ifdef WLAN_OPEN_SOURCE
+#ifdef WLAN_NS_OFFLOAD
+ cancel_work_sync(&pAdapter->ipv6NotifierWorkQueue);
+#endif
+#endif
if (test_bit(SME_SESSION_OPENED, &pAdapter->event_flags))
{