diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h
index 8c3932be2109..9e9774fe99a1 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -90,32 +90,6 @@ void cds_set_driver_state(enum cds_driver_state);
 void cds_clear_driver_state(enum cds_driver_state);
 enum cds_driver_state cds_get_driver_state(void);
 
-/**
- * cds_get_u16()- get 16 bit data in little endian
- * @ptr: buffer that holds data
- *
- * Return: uint16_t data in little endian format
- */
-static inline uint16_t cds_get_u16(uint8_t *ptr)
-{
-	return ((uint16_t) (*(ptr+1) << 8)) |
-		((uint16_t) (*ptr));
-}
-
-/**
- * cds_get_u32()- get 32 bit data in little endian
- * @ptr: buffer that holds data
- *
- * Return: uint32_t data in little endian format
- */
-static inline uint32_t cds_get_u32(uint8_t *ptr)
-{
-	return (*(ptr+3) << 24) |
-		(*(ptr+2) << 16) |
-		(*(ptr+1) << 8) |
-		(*(ptr));
-}
-
 /**
  * cds_is_driver_loading() - Is driver load in progress
  *
diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h
index 24b28711d78e..c71450f3e6e9 100644
--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.h
@@ -99,6 +99,8 @@ typedef enum {
  * @ht_present: ht element present or not
  * @vht_present: vht element present or not
  * @hs20_present: hs20 element present or not
+ * @ht_op_present: ht operation present or not
+ * @vht_op_present: vht operation present or not
  */
 struct hdd_conn_flag {
 	uint8_t ht_present:1;
@@ -173,7 +175,7 @@ struct hdd_conn_flag {
  * @ht_caps: holds ht capabilities info
  * @vht_caps: holds vht capabilities info
  * @hs20vendor_ie: holds passpoint/hs20 info
- * @hdd_conn_flag: flag conn info params is present or not
+ * @conn_flag: flag conn info params is present or not
  * @roam_count: roaming counter
  * @signal: holds rssi info
  * @assoc_status_code: holds assoc fail reason
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index af6bd9b9bc32..913c2359c1a7 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -3328,7 +3328,7 @@ fail:
  *
  * Return: Success(0) or reason code for failure
  */
-static int32_t
+static int
 __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy,
 			       struct wireless_dev *wdev,
 			       const void *data,
@@ -9465,8 +9465,8 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
 	}
 
 	pRoamProfile = &pWextState->roamProfile;
-	qdf_mem_zero(&hdd_sta_ctx->conn_info,
-		     sizeof(hdd_sta_ctx->conn_info));
+	qdf_mem_zero(&hdd_sta_ctx->conn_info.conn_flag,
+		     sizeof(hdd_sta_ctx->conn_info.conn_flag));
 
 	if (pRoamProfile) {
 		hdd_station_ctx_t *pHddStaCtx;
diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h
index d6e53b7118d2..81a968209364 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -406,8 +406,10 @@ enum qca_nl80211_vendor_subcmds {
  * latest cached information during the connected state , if queried
  * when in disconnected state.
  *
+ * @QCA_WLAN_VENDOR_ATTR_GET_STATION_INVALID: Invalid attribute
  * @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO: bss info
  * @QCA_WLAN_VENDOR_ATTR_GET_STATION_ASSOC_FAIL_REASON: assoc fail reason
+ * @QCA_WLAN_VENDOR_ATTR_GET_STATION_AFTER_LAST: After last
  */
 enum qca_wlan_vendor_attr_get_station {
 	QCA_WLAN_VENDOR_ATTR_GET_STATION_INVALID = 0,
@@ -504,6 +506,7 @@ enum qca_wlan_auth_type {
  * @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_ASSOC_FAIL_REASON:
  *  Status Code Corresponding to the Association Failure.
  *  Unsigned 32 bit value.
+ * @QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_AFTER_LAST: After last
  */
 enum qca_wlan_vendor_attr_get_station_info {
 	QCA_WLAN_VENDOR_ATTR_GET_STATION_INFO_INVALID = 0,