From 2a9f2a0525d2e49b0357b277b24364f93bb4858b Mon Sep 17 00:00:00 2001 From: Shashikala Prabhu Date: Mon, 6 Nov 2017 15:42:30 +0530 Subject: [PATCH] qcacmn: Rename dfs_ioctl.h as wlan_dfs_ioctl.h Rename dfs_ioctl.h file as wlan_dfs_ioctl.h and move it from cmn_services directory to dfs dispatcher. Change-Id: I75e0337bd84b71cf77975656423f78f9b016285f CRs-Fixed: 2127833 --- umac/dfs/core/src/dfs.h | 4 ++-- umac/dfs/core/src/misc/dfs.c | 1 - umac/dfs/core/src/misc/dfs_nol.c | 1 - .../inc/dfs_ioctl.h => dfs/dispatcher/inc/wlan_dfs_ioctl.h} | 6 +++--- umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h | 1 + 5 files changed, 6 insertions(+), 7 deletions(-) rename umac/{cmn_services/dfs/inc/dfs_ioctl.h => dfs/dispatcher/inc/wlan_dfs_ioctl.h} (98%) diff --git a/umac/dfs/core/src/dfs.h b/umac/dfs/core/src/dfs.h index c90d0fe54b..7cf2e2536c 100644 --- a/umac/dfs/core/src/dfs.h +++ b/umac/dfs/core/src/dfs.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include "dfs_structs.h" #include "dfs_channel.h" #include "dfs_ioctl_private.h" @@ -923,7 +923,7 @@ struct wlan_dfs { int wlan_dfs_nol_timeout; bool update_nol; uint32_t dfs_seq_num; - int dfs_nol_event[IEEE80211_CHAN_MAX]; + int dfs_nol_event[DFS_CHAN_MAX]; os_timer_t dfs_nol_timer; os_timer_t dfs_cac_timer; os_timer_t dfs_cac_valid_timer; diff --git a/umac/dfs/core/src/misc/dfs.c b/umac/dfs/core/src/misc/dfs.c index 5737475a57..363b740803 100644 --- a/umac/dfs/core/src/misc/dfs.c +++ b/umac/dfs/core/src/misc/dfs.c @@ -27,7 +27,6 @@ #include "wlan_dfs_mlme_api.h" #include "wlan_dfs_tgt_api.h" #include "../dfs_internal.h" -#include /* * Channel switch announcement (CSA) diff --git a/umac/dfs/core/src/misc/dfs_nol.c b/umac/dfs/core/src/misc/dfs_nol.c index 1eb531983a..7908d912fa 100644 --- a/umac/dfs/core/src/misc/dfs_nol.c +++ b/umac/dfs/core/src/misc/dfs_nol.c @@ -34,7 +34,6 @@ #include #include #include -#include /** * dfs_nol_timeout() - NOL timeout function. diff --git a/umac/cmn_services/dfs/inc/dfs_ioctl.h b/umac/dfs/dispatcher/inc/wlan_dfs_ioctl.h similarity index 98% rename from umac/cmn_services/dfs/inc/dfs_ioctl.h rename to umac/dfs/dispatcher/inc/wlan_dfs_ioctl.h index 9278b5eeef..978dd2df9c 100644 --- a/umac/cmn_services/dfs/inc/dfs_ioctl.h +++ b/umac/dfs/dispatcher/inc/wlan_dfs_ioctl.h @@ -59,8 +59,8 @@ */ #define DFS_LAST_IOCTL 26 -#ifndef IEEE80211_CHAN_MAX -#define IEEE80211_CHAN_MAX 1023 +#ifndef DFS_CHAN_MAX +#define DFS_CHAN_MAX 1023 #endif /** @@ -80,7 +80,7 @@ struct dfsreq_nolelem { struct dfsreq_nolinfo { uint32_t dfs_ch_nchans; - struct dfsreq_nolelem dfs_nol[IEEE80211_CHAN_MAX]; + struct dfsreq_nolelem dfs_nol[DFS_CHAN_MAX]; }; /* diff --git a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h index 49824f384d..48b8429385 100644 --- a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h +++ b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h @@ -47,6 +47,7 @@ #endif #include +#include /* Number of dev type: Direct attach and Offload */ #define MAX_DEV_TYPE 2