Quellcode durchsuchen

qcacld-3.0: Remove use of WLAN_OPEN_SOURCE

The WLAN_OPEN_SOURCE flag is a legacy flag which had a specific use
that is no longer applicable. So remove all usage of that flag.

Change-Id: If51b9421717bc82b3c200c6412a87b0e46a77476
CRs-Fixed: 3464926
Jeff Johnson vor 2 Jahren
Ursprung
Commit
463ddf6870

+ 1 - 1
core/cds/inc/cds_sched.h

@@ -28,7 +28,7 @@
 #include <qdf_event.h>
 #include <i_qdf_types.h>
 #include <linux/wait.h>
-#if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK)
+#if defined(CONFIG_HAS_WAKELOCK)
 #include <linux/wakelock.h>
 #endif
 #include <qdf_types.h>

+ 1 - 1
core/hdd/inc/wlan_hdd_main.h

@@ -60,7 +60,7 @@
 #include <wlan_hdd_cfg.h>
 #include <linux/spinlock.h>
 #include <ani_system_defs.h>
-#if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK)
+#if defined(CONFIG_HAS_WAKELOCK)
 #include <linux/wakelock.h>
 #endif
 #ifdef WLAN_FEATURE_TSF_PTP

+ 1 - 3
core/hdd/src/wlan_hdd_debugfs.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -26,7 +26,6 @@
  * wlan_wcnss/pattern_gen to configure periodic TX patterns.
  */
 
-#ifdef WLAN_OPEN_SOURCE
 #include "osif_sync.h"
 #include <wlan_hdd_includes.h>
 #include <wlan_hdd_debugfs.h>
@@ -570,4 +569,3 @@ void hdd_debugfs_exit(struct hdd_adapter *adapter)
 {
 	debugfs_remove_recursive(adapter->debugfs_phy);
 }
-#endif /* #ifdef WLAN_OPEN_SOURCE */

+ 0 - 4
core/hdd/src/wlan_hdd_main.c

@@ -8423,11 +8423,9 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 
 		hdd_deregister_tx_flow_control(adapter);
 
-#ifdef WLAN_OPEN_SOURCE
 		cancel_work_sync(&adapter->ipv4_notifier_work);
 #ifdef WLAN_NS_OFFLOAD
 		cancel_work_sync(&adapter->ipv6_notifier_work);
-#endif
 #endif
 
 		if (adapter->device_mode == QDF_STA_MODE) {
@@ -8610,11 +8608,9 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 				wlan_hdd_send_avoid_freq_for_dnbs(hdd_ctx, 0);
 		}
 
-#ifdef WLAN_OPEN_SOURCE
 		cancel_work_sync(&adapter->ipv4_notifier_work);
 #ifdef WLAN_NS_OFFLOAD
 		cancel_work_sync(&adapter->ipv6_notifier_work);
-#endif
 #endif
 		sap_release_vdev_ref(WLAN_HDD_GET_SAP_CTX_PTR(adapter));
 

+ 0 - 4
core/hdd/src/wlan_hdd_nan_datapath.c

@@ -92,16 +92,12 @@ static int hdd_close_ndi(struct hdd_adapter *adapter)
 				     WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,
 				     WLAN_CONTROL_PATH);
 
-#ifdef WLAN_OPEN_SOURCE
 	cancel_work_sync(&adapter->ipv4_notifier_work);
-#endif
 	hdd_deregister_hl_netdev_fc_timer(adapter);
 	hdd_deregister_tx_flow_control(adapter);
 
 #ifdef WLAN_NS_OFFLOAD
-#ifdef WLAN_OPEN_SOURCE
 	cancel_work_sync(&adapter->ipv6_notifier_work);
-#endif
 #endif
 	errno = hdd_vdev_destroy(adapter);
 	if (errno)

+ 1 - 1
core/hdd/src/wlan_hdd_power.c

@@ -31,7 +31,7 @@
 #include <linux/cpu.h>
 #include "osif_sync.h"
 #include <wlan_hdd_includes.h>
-#if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK)
+#if defined(CONFIG_HAS_WAKELOCK)
 #include <linux/wakelock.h>
 #endif
 #include "qdf_types.h"