qcacld-3.0: Fix namespace collision in DFS module

Fix namespace collision of the DFS module
with userspace.

Change-Id: I4ca582e9cb5713238cbae3060005375682fc8806
CRs-Fixed: 935515

core/sap/dfs/inc/dfs.h

@@ -409,7 +409,7 @@ struct dfs_filtertype {
 };
 
 struct dfs_state {
-	struct ieee80211_channel rs_chan;       /* Channel info */
+	struct dfs_ieee80211_channel rs_chan;       /* Channel info */
 	uint8_t rs_chanindex;   /* Channel index in radar structure */
 	uint32_t rs_numradarevents;     /* Number of radar events */
 
@@ -728,10 +728,11 @@ int dfs_set_thresholds(struct ieee80211com *ic,
 		       const uint32_t threshtype, const uint32_t value);
 
 /* PHY error and radar event handling */
-int dfs_process_radarevent(struct ath_dfs *dfs, struct ieee80211_channel *chan);
+int dfs_process_radarevent(struct ath_dfs *dfs,
+				struct dfs_ieee80211_channel *chan);
 
 /* Non occupancy (NOL) handling prototypes */
-void dfs_nol_addchan(struct ath_dfs *dfs, struct ieee80211_channel *chan,
+void dfs_nol_addchan(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan,
 		     uint32_t dfs_nol_timeout);
 void dfs_get_nol(struct ath_dfs *dfs, struct dfsreq_nolelem *dfs_nol,
 		 int *nchan);
@@ -803,7 +804,7 @@ int dfs_get_filter_threshold(struct ath_dfs *dfs, struct dfs_filter *rf,
 /* Commenting out since all the ar functions are obsolete and
  * the function definition has been removed as part of dfs_ar.c
  * void dfs_process_ar_event(struct ath_dfs *dfs,
- *	struct ieee80211_channel *chan);
+ *	struct dfs_ieee80211_channel *chan);
  */
 /* Commenting out since all the ar functions are obsolete and
  * the function definition has been removed as part of dfs_ar.c
@@ -819,6 +820,6 @@ void dfs_reset_ar(struct ath_dfs *dfs);
  * void        dfs_reset_arq(struct ath_dfs *dfs);
  */
 
-struct ieee80211_channel *ieee80211_get_extchan(struct ieee80211com *ic);
+struct dfs_ieee80211_channel *ieee80211_get_extchan(struct ieee80211com *ic);
 
 #endif /* _DFS_H_ */

core/sap/dfs/src/dfs.c

@@ -85,7 +85,7 @@ uint32_t dfs_debug_level = ATH_DEBUG_DFS;
  * both the primary and extension.
  */
 static void
-dfs_channel_mark_radar(struct ath_dfs *dfs, struct ieee80211_channel *chan)
+dfs_channel_mark_radar(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan)
 {
 	struct ieee80211_channel_list chan_info;
 	int i;
@@ -535,7 +535,7 @@ int dfs_radar_enable(struct ieee80211com *ic,
 	/* uint32_t                        rfilt; */
 	struct ath_dfs *dfs;
 	struct dfs_state *rs_pri, *rs_ext;
-	struct ieee80211_channel *chan = ic->ic_curchan, *ext_ch = NULL;
+	struct dfs_ieee80211_channel *chan = ic->ic_curchan, *ext_ch = NULL;
 	is_ext_ch = IEEE80211_IS_CHAN_11N_HT40(ic->ic_curchan);
 	dfs = (struct ath_dfs *)ic->ic_dfs;
 	rs_pri = NULL;

core/sap/dfs/src/dfs_misc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -205,7 +205,7 @@ uint32_t dfs_round(int32_t val)
 		return (ival + 1);
 }
 
-struct ieee80211_channel *ieee80211_get_extchan(struct ieee80211com *ic)
+struct dfs_ieee80211_channel *ieee80211_get_extchan(struct ieee80211com *ic)
 {
 	int chan_offset = 0;
 	if (IEEE80211_IS_CHAN_HT40PLUS_CAPABLE(ic->ic_curchan)) {
@@ -228,7 +228,7 @@ struct dfs_state *dfs_getchanstate(struct ath_dfs *dfs, uint8_t *index,
 {
 	struct dfs_state *rs = NULL;
 	int i;
-	struct ieee80211_channel *cmp_ch;
+	struct dfs_ieee80211_channel *cmp_ch;
 
 	if (dfs == NULL) {
 		printk("%s[%d]: sc_dfs is NULL\n", __func__, __LINE__);

core/sap/dfs/src/dfs_nol.c

@@ -149,7 +149,7 @@ void dfs_set_nol(struct ath_dfs *dfs, struct dfsreq_nolelem *dfs_nol, int nchan)
 {
 #define TIME_IN_MS 1000
 	uint32_t nol_time_left_ms;
-	struct ieee80211_channel chan;
+	struct dfs_ieee80211_channel chan;
 	int i;
 
 	if (dfs == NULL) {
@@ -177,7 +177,7 @@ void dfs_set_nol(struct ath_dfs *dfs, struct dfsreq_nolelem *dfs_nol, int nchan)
 }
 
 void
-dfs_nol_addchan(struct ath_dfs *dfs, struct ieee80211_channel *chan,
+dfs_nol_addchan(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan,
 		uint32_t dfs_nol_timeout)
 {
 #define TIME_IN_MS 1000

core/sap/dfs/src/dfs_process_phyerr.c

@@ -474,7 +474,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen,
 		   uint64_t r_fulltsf, bool enable_log)
 {
 	struct ath_dfs *dfs = (struct ath_dfs *)ic->ic_dfs;
-	struct ieee80211_channel *chan = ic->ic_curchan;
+	struct dfs_ieee80211_channel *chan = ic->ic_curchan;
 	struct dfs_event *event;
 	struct dfs_phy_err e;
 	int empty;

core/sap/dfs/src/dfs_process_radarevent.c

@@ -112,7 +112,8 @@ static inline uint8_t dfs_process_pulse_dur(struct ath_dfs *dfs, uint8_t re_dur)
  * and ext channels as being unavailable.  This should be fixed for 802.11ac
  * or we'll quickly run out of valid channels to use.
  */
-int dfs_process_radarevent(struct ath_dfs *dfs, struct ieee80211_channel *chan)
+int dfs_process_radarevent(struct ath_dfs *dfs,
+				struct dfs_ieee80211_channel *chan)
 {
 /* commenting for now to validate radar indication msg to SAP */
 /* #if 0 */
@@ -124,7 +125,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, struct ieee80211_channel *chan)
 	int events_processed = 0;
 	uint32_t tabledepth, index;
 	uint64_t deltafull_ts = 0, this_ts, deltaT;
-	struct ieee80211_channel *thischan;
+	struct dfs_ieee80211_channel *thischan;
 	struct dfs_pulseline *pl;
 	static uint32_t test_ts = 0;
 	static uint32_t diff_ts = 0;