Selaa lähdekoodia

qcacmn: Avoid CAC when switching to the same channel

Changes related to If63678a7e9ce00c1166e7f6533e5eaa0b0ae67a5
on modifying declaration of dfs_mlme_start_csa function on mlme side.

Change-Id: Id746faaaa2cdbdb48f80056eec3dd661a30122e5
CRs-fixed: 2117811
Shaakir Mohamed 7 vuotta sitten
vanhempi
sitoutus
f6cb4b8576

+ 5 - 2
umac/dfs/core/src/misc/dfs.c

@@ -84,8 +84,11 @@ static os_timer_func(dfs_testtimer_task)
 	 */
 	dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS, "go back to channel %d",
 			dfs->wlan_dfstest_ieeechan);
-
-	dfs_mlme_start_csa(dfs->dfs_pdev_obj, dfs->wlan_dfstest_ieeechan);
+	dfs_mlme_start_csa(dfs->dfs_pdev_obj,
+			dfs->wlan_dfstest_ieeechan,
+			dfs->dfs_curchan->dfs_ch_freq,
+			dfs->dfs_curchan->dfs_ch_vhtop_ch_freq_seg2,
+			dfs->dfs_curchan->dfs_ch_flags);
 }
 
 static inline int dfs_fill_emulate_bang_radar_test(struct wlan_dfs *dfs,

+ 9 - 2
umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h

@@ -65,9 +65,16 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
 /**
  * dfs_mlme_start_csa() - Sends CSA in ieeeChan
  * @pdev: Pointer to DFS pdev object.
- * @ieeeChan: Channel number.
+ * @ieee_chan: Channel number.
+ * @freq: Channel frequency.
+ * @cfreq2: HT80 cfreq2.
+ * @flags: channel flags.
  */
-void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev, uint8_t ieeeChan);
+void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
+		uint8_t ieee_chan,
+		uint16_t freq,
+		uint8_t cfreq2,
+		uint64_t flags);
 
 /**
  * dfs_mlme_proc_cac() - Process the CAC completion event.

+ 2 - 1
umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h

@@ -79,7 +79,8 @@ struct dfs_to_mlme {
 			uint8_t vhtop_ch_freq_seg2,
 			uint64_t flags);
 	QDF_STATUS (*mlme_start_csa)(struct wlan_objmgr_pdev *pdev,
-			uint8_t ieeeChan);
+			uint8_t ieee_chan, uint16_t freq,
+			uint8_t cfreq2, uint64_t flags);
 	QDF_STATUS (*mlme_proc_cac)(struct wlan_objmgr_pdev *pdev);
 	QDF_STATUS (*mlme_deliver_event_up_afrer_cac)(
 			struct wlan_objmgr_pdev *pdev);

+ 4 - 2
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c

@@ -98,10 +98,12 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
 #endif
 
 void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
-		uint8_t ieeeChan)
+		uint8_t ieee_chan, uint16_t freq,
+		uint8_t cfreq2, uint64_t flags)
 {
 	if (global_dfs_to_mlme.mlme_start_csa != NULL)
-		global_dfs_to_mlme.mlme_start_csa(pdev, ieeeChan);
+		global_dfs_to_mlme.mlme_start_csa(pdev, ieee_chan, freq, cfreq2,
+				flags);
 }
 
 #ifndef QCA_MCL_DFS_SUPPORT