qcacld-3.0: Generalize mlme_set_twt_peer_capabilities() api

Currently mlme_set_twt_peer_capabilities() api is use to
update twt capabilities using he caps and he ops. But now
onwards partial TWT(requestor and responder) can be
supported from 11n mode also.
Make this api as generic so that it can be use for both
11ax and 11n.

Change-Id: Id89e056927a914938efad7116796cbf64b5764db
CRs-Fixed: 3185133

components/mlme/core/inc/wlan_mlme_twt_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -123,13 +124,11 @@ uint8_t mlme_get_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
  * context
  * @psoc: Pointer to psoc object
  * @peer_mac: Pointer to peer mac address
- * @he_cap: Pointer to HE capabilities IE
- * @he_op: Pointer to HE operations IE
+ * @caps: Bitmap of enum wlan_twt_capabilities
  */
 void mlme_set_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
 				    struct qdf_mac_addr *peer_mac,
-				    tDot11fIEhe_cap *he_cap,
-				    tDot11fIEhe_op *he_op);
+				    uint8_t caps);
 
 /**
  * mlme_twt_any_peer_cmd_in_progress() - Iterate through the list of peers
@@ -324,8 +323,7 @@ bool mlme_is_24ghz_twt_enabled(struct wlan_objmgr_psoc *psoc);
 static inline
 void mlme_set_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
 				    struct qdf_mac_addr *peer_mac,
-				    tDot11fIEhe_cap *he_cap,
-				    tDot11fIEhe_op *he_op)
+				    uint8_t caps)
 {}
 
 static inline

components/mlme/core/src/wlan_mlme_twt_api.c

@@ -463,12 +463,10 @@ uint8_t mlme_get_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
 
 void mlme_set_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
 				    struct qdf_mac_addr *peer_mac,
-				    tDot11fIEhe_cap *he_cap,
-				    tDot11fIEhe_op *he_op)
+				    uint8_t caps)
 {
 	struct wlan_objmgr_peer *peer;
 	struct peer_mlme_priv_obj *peer_priv;
-	uint8_t caps = 0;
 
 	peer = wlan_objmgr_get_peer_by_mac(psoc, peer_mac->bytes,
 					   WLAN_MLME_NB_ID);
@@ -486,21 +484,6 @@ void mlme_set_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
 		return;
 	}
 
-	if (he_cap->twt_request)
-		caps |= WLAN_TWT_CAPA_REQUESTOR;
-
-	if (he_cap->twt_responder)
-		caps |= WLAN_TWT_CAPA_RESPONDER;
-
-	if (he_cap->broadcast_twt)
-		caps |= WLAN_TWT_CAPA_BROADCAST;
-
-	if (he_cap->flex_twt_sched)
-		caps |= WLAN_TWT_CAPA_FLEXIBLE;
-
-	if (he_op->twt_required)
-		caps |= WLAN_TWT_CAPA_REQUIRED;
-
 	peer_priv->twt_ctx.peer_capability = caps;
 	wlan_objmgr_peer_release_ref(peer, WLAN_MLME_NB_ID);
 }

core/mac/src/pe/lim/lim_api.c

@@ -1791,8 +1791,25 @@ void lim_set_twt_peer_capabilities(struct mac_context *mac_ctx,
 				   tDot11fIEhe_cap *he_cap,
 				   tDot11fIEhe_op *he_op)
 {
+	uint8_t caps = 0;
+
+	if (he_cap->twt_request)
+		caps |= WLAN_TWT_CAPA_REQUESTOR;
+
+	if (he_cap->twt_responder)
+		caps |= WLAN_TWT_CAPA_RESPONDER;
+
+	if (he_cap->broadcast_twt)
+		caps |= WLAN_TWT_CAPA_BROADCAST;
+
+	if (he_cap->flex_twt_sched)
+		caps |= WLAN_TWT_CAPA_FLEXIBLE;
+
+	if (he_op->twt_required)
+		caps |= WLAN_TWT_CAPA_REQUIRED;
+
 	mlme_set_twt_peer_capabilities(mac_ctx->psoc, peer_mac,
-					he_cap, he_op);
+				       caps);
 }
 #endif /* WLAN_TWT_CONV_SUPPORTED */
 #endif /* WLAN_SUPPORT_TWT */