updated with main branch

Neternels · May 6, 2021 · 8a054b3 · 8a054b3
1 parent 559a592
commit 8a054b3
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
@@ -12806,9 +12806,9 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx)
    unregister_inetaddr_notifier(&pHddCtx->ipv4_notifier);
 
    // Unregister the Net Device Notifier
-   unregister_netdevice_notifier(&hdd_netdev_notifier);
+   //unregister_netdevice_notifier(&hdd_netdev_notifier);
 
-   hdd_stop_all_adapters( pHddCtx );
+   //hdd_stop_all_adapters( pHddCtx );
 
 #ifdef WLAN_BTAMP_FEATURE
    vosStatus = WLANBAP_Stop(pVosContext);
@@ -14600,6 +14600,7 @@ int hdd_wlan_startup(struct device *dev )
       goto err_unregister_pmops;
    }
 
+   /*
    // register net device notifier for device change notification
    ret = register_netdevice_notifier(&hdd_netdev_notifier);
 
@@ -14608,12 +14609,14 @@ int hdd_wlan_startup(struct device *dev )
       hddLog(VOS_TRACE_LEVEL_ERROR,"%s: register_netdevice_notifier failed",__func__);
       goto err_unregister_pmops;
    }
+   */
 
    //Initialize the BTC service
    if(btc_activate_service(pHddCtx) != 0)
    {
       hddLog(VOS_TRACE_LEVEL_FATAL,"%s: btc_activate_service failed",__func__);
-      goto err_reg_netdev;
+      //goto err_reg_netdev;
+      goto err_nl_srv;
    }
 
 #ifdef FEATURE_OEM_DATA_SUPPORT
@@ -14825,8 +14828,8 @@ int hdd_wlan_startup(struct device *dev )
 err_btc_activate_service:
    btc_deactivate_service();
 
-err_reg_netdev:
-   unregister_netdevice_notifier(&hdd_netdev_notifier);
+//err_reg_netdev:
+//   unregister_netdevice_notifier(&hdd_netdev_notifier);
 
 err_unregister_pmops:
    hddDevTmUnregisterNotifyCallback(pHddCtx);