Parcourir la source

qcacld-3.0: resolve compilation errors with older kernels

Resolve the compilation issues with older kernels.

Change-Id: I5cbafcf84f5bb76d0ffb1b3c72981a93e0b0b519
CRs-Fixed: 3571648
Arun Kumar Khandavalli il y a 1 an
Parent
commit
c86007738a

+ 3 - 3
core/hdd/src/wlan_hdd_stats.c

@@ -677,7 +677,7 @@ static bool put_wifi_peer_rates(struct wifi_peer_info *stats,
 	return true;
 }
 
-#if defined(WLAN_FEATURE_11BE_MLO)
+#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
 /**
  * wlan_hdd_update_mlo_iface_stats_info() - update mlo per link iface stats info
  * @hdd_ctx: Pointer to hdd_context
@@ -1350,7 +1350,7 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
 	wlan_cfg80211_vendor_cmd_reply(skb);
 }
 
-#if defined(WLAN_FEATURE_11BE_MLO)
+#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
 /**
  * hdd_cache_ll_iface_stats() - Caches ll_stats received from fw
  * @hdd_ctx: Pointer to hdd_context
@@ -7456,7 +7456,7 @@ static int wlan_hdd_get_sta_stats(struct wlan_hdd_link_info *link_info,
 	return 0;
 }
 
-#if defined(WLAN_FEATURE_11BE_MLO)
+#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
 #define WLAN_INVALID_RSSI_VALUE -128
 /**
  * wlan_hdd_copy_hdd_stats_to_sinfo() - Copy hdd station stats info to sinfo

+ 0 - 1
core/mac/src/pe/lim/lim_mlo.h

@@ -399,7 +399,6 @@ QDF_STATUS lim_get_bpcc_from_mlo_ie(tSchBeaconStruct *bcn,
  * Return: bool
  */
 bool lim_check_cu_happens(struct wlan_objmgr_vdev *vdev, uint8_t new_bpcc);
-
 #else
 static inline void lim_mlo_roam_peer_disconn_del(struct wlan_objmgr_vdev *vdev)
 {

+ 0 - 5
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -1802,11 +1802,6 @@ lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session)
 		eht_config->bw_320_tx_max_nss_for_mcs_12_and_13 = tx_nss;
 	}
 }
-#else
-void
-lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session)
-{
-}
 #endif
 
 static void lim_check_oui_and_update_session(struct mac_context *mac_ctx,

+ 16 - 12
core/mac/src/pe/lim/lim_utils.h

@@ -2128,6 +2128,17 @@ void lim_update_stads_eht_bw_320mhz(struct pe_session *session,
  * Return: bool
  */
 bool lim_is_session_chwidth_320mhz(struct pe_session *session);
+
+/**
+ * lim_update_eht_caps_mcs() - update eht caps
+ *
+ * @mac: Pointer to Global mac structure
+ * @session: Session pointer of the interface
+ *
+ * Return: None
+ */
+void
+lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session);
 #else
 static inline
 void lim_update_tdls_sta_eht_capable(struct mac_context *mac,
@@ -2313,6 +2324,11 @@ lim_is_session_chwidth_320mhz(struct pe_session *session)
 {
 	return false;
 }
+
+static inline void
+lim_update_eht_caps_mcs(struct mac_context *mac, struct pe_session *session)
+{
+}
 #endif /* WLAN_FEATURE_11BE */
 
 #ifdef WLAN_FEATURE_11BE_MLO
@@ -3313,16 +3329,4 @@ lim_is_chan_connected_for_mode(struct wlan_objmgr_psoc *psoc,
  */
 enum phy_ch_width
 lim_convert_vht_chwidth_to_phy_chwidth(uint8_t ch_width, bool is_40);
-
-/**
- * lim_update_eht_caps_mcs() - update eht caps
- *
- * @mac: Pointer to Global mac structure
- * @session: Session pointer of the interface
- *
- * Return: None
- */
-void lim_update_eht_caps_mcs(struct mac_context *mac,
-			     struct pe_session *session);
-
 #endif /* __LIM_UTILS_H */