summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYun Park <yunp@qca.qualcomm.com>2016-04-05 17:04:44 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-04-22 15:26:29 +0530
commit9d0c8b8f28090f1824653577ddd075130a4f815a (patch)
tree76330f427406bcdfc558fa0b401433f272c3b03b
parent169719583b3e6feaa08084bdb37c309e6c7ca855 (diff)
qcacld-2.0: Add a suffix MULTI_IF_NAME to the procfs directories
With two instances of the driver loaded, unloading one driver removes the shared procfs directories with another driver. Also this creates a memory leak as the file created by other driver is not deleted properly. Add a fix to use different directories for multiple drivers by appending MULTI_IF_NAME. Change-Id: I08bcf0f526dbc7e5c1d64684eec330b13c05aa8c CRs-Fixed: 999587
-rw-r--r--CORE/HDD/src/wlan_hdd_memdump.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/CORE/HDD/src/wlan_hdd_memdump.c b/CORE/HDD/src/wlan_hdd_memdump.c
index 359cd8d9c5bb..b8366191a976 100644
--- a/CORE/HDD/src/wlan_hdd_memdump.c
+++ b/CORE/HDD/src/wlan_hdd_memdump.c
@@ -351,7 +351,11 @@ int wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy,
return ret;
}
+#ifdef MULTI_IF_NAME
+#define PROCFS_MEMDUMP_DIR "debug" MULTI_IF_NAME
+#else
#define PROCFS_MEMDUMP_DIR "debug"
+#endif
#define PROCFS_MEMDUMP_NAME "fwdump"
#define PROCFS_MEMDUMP_PERM 0444
@@ -667,14 +671,12 @@ void memdump_deinit(void) {
}
}
-#define PROCFS_DRIVER_DUMP_DIR "debugdriver"
-
#ifdef MULTI_IF_NAME
-#define PROCFS_DRIVER_DUMP_NAME "driverdump" MULTI_IF_NAME
+#define PROCFS_DRIVER_DUMP_DIR "debugdriver" MULTI_IF_NAME
#else
-#define PROCFS_DRIVER_DUMP_NAME "driverdump"
+#define PROCFS_DRIVER_DUMP_DIR "debugdriver"
#endif
-
+#define PROCFS_DRIVER_DUMP_NAME "driverdump"
#define PROCFS_DRIVER_DUMP_PERM 0444
static struct proc_dir_entry *proc_file_driver, *proc_dir_driver;