qcacld-3.0: Indicate operating frequency to SON when radar is detected

When radar is detected in EasyMesh agent, it should update its current
operating frequency as disallowed due to radar detection to EasyMesh
controller through channel preference report frame.

Indicate operating frequency to SON when radar is detected, so that
EasyMesh agent can notify it to EasyMesh controller.

Change-Id: I83de68c8a3aecd3588d14f59081d6676304093b9
CRs-Fixed: 3262578

core/hdd/src/wlan_hdd_hostapd.c

@@ -1895,6 +1895,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	uint8_t pdev_id;
 	bool notify_new_sta = true;
 	struct wlan_objmgr_vdev *vdev;
+	qdf_freq_t dfs_freq;
 
 	dev = context;
 	if (!dev) {
@@ -2223,7 +2224,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		} else {
 			hdd_debug("Sent CAC end (interrupted) to user space");
 		}
-		hdd_son_deliver_cac_status_event(adapter, true);
+		dfs_freq = wlan_reg_chan_band_to_freq(hdd_ctx->pdev,
+						      dfs_info.channel,
+						      BIT(REG_BAND_5G));
+		hdd_son_deliver_cac_status_event(adapter, dfs_freq, true);
 		break;
 	case eSAP_DFS_CAC_END:
 		wlan_hdd_send_svc_nlink_msg(hdd_ctx->radio_index,
@@ -2248,7 +2252,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		} else {
 			hdd_debug("Sent CAC end to user space");
 		}
-		hdd_son_deliver_cac_status_event(adapter, false);
+		dfs_freq = wlan_reg_chan_band_to_freq(hdd_ctx->pdev,
+						      dfs_info.channel,
+						      BIT(REG_BAND_5G));
+		hdd_son_deliver_cac_status_event(adapter, dfs_freq, false);
 		break;
 	case eSAP_DFS_RADAR_DETECT:
 	{
@@ -2275,7 +2282,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		} else {
 			hdd_debug("Sent radar detected to user space");
 		}
-		hdd_son_deliver_cac_status_event(adapter, true);
+		dfs_freq = wlan_reg_chan_band_to_freq(hdd_ctx->pdev,
+						      dfs_info.channel,
+						      BIT(REG_BAND_5G));
+		hdd_son_deliver_cac_status_event(adapter, dfs_freq, true);
 		break;
 	}
 

core/hdd/src/wlan_hdd_pre_cac.c

@@ -531,7 +531,9 @@ wlan_hdd_pre_cac_conditional_freq_switch_ind(struct wlan_objmgr_vdev *vdev,
 		adapter->hdd_ctx->dev_dfs_cac_status = DFS_CAC_ALREADY_DONE;
 	} else {
 		adapter->hdd_ctx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE;
-		hdd_son_deliver_cac_status_event(adapter, true);
+		hdd_son_deliver_cac_status_event(adapter,
+						 ucfg_pre_cac_get_freq(vdev),
+						 true);
 	}
 }
 

core/hdd/src/wlan_hdd_son.c

@@ -2610,10 +2610,11 @@ int hdd_son_deliver_acs_complete_event(struct hdd_adapter *adapter)
 }
 
 int hdd_son_deliver_cac_status_event(struct hdd_adapter *adapter,
-				     bool radar_detected)
+				     qdf_freq_t freq, bool radar_detected)
 {
 	int ret = -EINVAL;
 	struct wlan_objmgr_vdev *vdev;
+	struct son_ald_cac_info cac_info;
 
 	if (adapter) {
 		vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_SON_ID);
@@ -2621,9 +2622,11 @@ int hdd_son_deliver_cac_status_event(struct hdd_adapter *adapter,
 			hdd_err("null vdev");
 			return ret;
 		}
+		cac_info.freq = freq;
+		cac_info.radar_detected = radar_detected;
 		ret = os_if_son_deliver_ald_event(vdev, NULL,
 						  MLME_EVENT_CAC_STATUS,
-						  &radar_detected);
+						  &cac_info);
 		hdd_objmgr_put_vdev_by_user(vdev, WLAN_SON_ID);
 	}
 

core/hdd/src/wlan_hdd_son.h

@@ -56,12 +56,13 @@ int hdd_son_deliver_acs_complete_event(struct hdd_adapter *adapter);
 /**
  * hdd_son_deliver_cac_status_event() - send cac status to son
  * @adapter: adapter object
+ * @freq: the operating frequency when radar is detected
  * @radar_detected: true if radar is detected else false
  *
  * Return: 0 if event is sent successfully
  */
 int hdd_son_deliver_cac_status_event(struct hdd_adapter *adapter,
-				     bool radar_detected);
+				     qdf_freq_t freq, bool radar_detected);
 
 /**
  * hdd_son_deliver_assoc_disassoc_event() - send sta assoc disassoc event
@@ -135,7 +136,7 @@ static inline int
 
 static inline int
 	hdd_son_deliver_cac_status_event(struct hdd_adapter *adapter,
-					 bool radar_detected)
+					 qdf_freq_t freq, bool radar_detected)
 {
 	return 0;
 }