qcacld-3.0: Mismatch of TWT responder bit in HE caps and EXT caps

In a beacon template, there is a mismatch of twt responder bit in
HE caps and extended caps.

During start BSS, there is a kernel flag related with twt
responder. Intersect this kernel flag and service bit capability
before calling twt enable/disable api in start BSS.

Change-Id: I0725fc560904c622cc47f43958bcd490daacfa2f
CRs-Fixed: 2995538

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1453,6 +1453,7 @@ struct wlan_mlme_acs {
  * 2.4Ghz
  * @req_flag: requestor flag enable/disable
  * @res_flag: responder flag enable/disable
+ * @twt_res_svc_cap: responder service capability
  */
 struct wlan_mlme_cfg_twt {
 	bool is_twt_enabled;
@@ -1468,6 +1469,7 @@ struct wlan_mlme_cfg_twt {
 	bool enable_twt_24ghz;
 	bool req_flag;
 	bool res_flag;
+	bool twt_res_svc_cap;
 };
 
 /**

components/mlme/dispatcher/inc/wlan_mlme_twt_ucfg_api.h

@@ -218,6 +218,25 @@ QDF_STATUS ucfg_mlme_set_twt_requestor_flag(struct wlan_objmgr_psoc *psoc,
  */
 QDF_STATUS ucfg_mlme_set_twt_responder_flag(struct wlan_objmgr_psoc *psoc,
 					    bool val);
+/**
+ * ucfg_mlme_set_twt_res_service_cap() - Set twt responder service capability
+ * @psoc: pointer to psoc object
+ * @val: Value to be set to config
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS
+ucfg_mlme_set_twt_res_service_cap(struct wlan_objmgr_psoc *psoc, bool val);
+
+/**
+ * ucfg_mlme_get_twt_res_service_cap() - Get twt responder service capability
+ * @psoc: pointer to psoc object
+ * @val: Value to be set to config
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS
+ucfg_mlme_get_twt_res_service_cap(struct wlan_objmgr_psoc *psoc, bool *val);
 
 /**
  * ucfg_mlme_reset_twt_init_context() - Reset twt init if ack fail
@@ -728,5 +747,18 @@ ucfg_mlme_get_twt_session_state(struct wlan_objmgr_psoc *psoc,
 	return WLAN_TWT_SETUP_STATE_NOT_ESTABLISHED;
 }
 
+static inline QDF_STATUS
+ucfg_mlme_set_twt_res_service_cap(struct wlan_objmgr_psoc *psoc, bool val)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
+static inline QDF_STATUS
+ucfg_mlme_get_twt_res_service_cap(struct wlan_objmgr_psoc *psoc, bool *val)
+{
+	*val = false;
+	return QDF_STATUS_E_NOSUPPORT;
+}
+
 #endif /* defined(WLAN_SUPPORT_TWT) && defined(WLAN_FEATURE_11AX) */
 #endif /* _WLAN_MLME_TWT_UCFG_API_H_ */

components/mlme/dispatcher/src/wlan_mlme_twt_ucfg_api.c

@@ -329,4 +329,33 @@ ucfg_mlme_get_twt_statistics_tgt_cap(struct wlan_objmgr_psoc *psoc, bool *val)
 
 	return QDF_STATUS_SUCCESS;
 }
+
+QDF_STATUS
+ucfg_mlme_set_twt_res_service_cap(struct wlan_objmgr_psoc *psoc, bool val)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return QDF_STATUS_E_INVAL;
+
+	mlme_obj->cfg.twt_cfg.twt_res_svc_cap = val;
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS
+ucfg_mlme_get_twt_res_service_cap(struct wlan_objmgr_psoc *psoc, bool *val)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return QDF_STATUS_E_INVAL;
+
+	*val = mlme_obj->cfg.twt_cfg.twt_res_svc_cap;
+
+	return QDF_STATUS_SUCCESS;
+}
+
 #endif

core/hdd/src/wlan_hdd_hostapd.c

@@ -6505,7 +6505,13 @@ static void
 wlan_hdd_update_twt_responder(struct hdd_context *hdd_ctx,
 			      struct cfg80211_ap_settings *params)
 {
-	ucfg_mlme_set_twt_responder(hdd_ctx->psoc, params->twt_responder);
+	bool twt_res_svc_cap, enable_twt;
+
+	enable_twt = ucfg_mlme_is_twt_enabled(hdd_ctx->psoc);
+	ucfg_mlme_get_twt_res_service_cap(hdd_ctx->psoc, &twt_res_svc_cap);
+	ucfg_mlme_set_twt_responder(hdd_ctx->psoc, QDF_MIN(
+					twt_res_svc_cap,
+					(enable_twt && params->twt_responder)));
 	if (params->twt_responder)
 		hdd_send_twt_responder_enable_cmd(hdd_ctx);
 	else

core/hdd/src/wlan_hdd_twt.c

@@ -4002,6 +4002,11 @@ void hdd_update_tgt_twt_cap(struct hdd_context *hdd_ctx,
 		  cfg->twt_bcast_req_support, cfg->twt_bcast_res_support,
 		  cfg->legacy_bcast_twt_support);
 
+	/*
+	 * Set the twt fw responder service capability
+	 */
+	ucfg_mlme_set_twt_res_service_cap(hdd_ctx->psoc,
+					  services->twt_responder);
 	/*
 	 * The HE cap IE in frame will have intersection of
 	 * "enable_twt" ini, twt requestor fw service cap and