qcacld-3.0: Send peer authorized to FW for partner VDEV

In hdd_change_peer_state() vdev_id is taken from deflink
of adapter so peer authorized event is not sent to FW
for the partner VDEV.

Change the argument of hdd_change_peer_state() to take
link info pointer instead of adapter to get the proper
VDEV to send the peer authorized event to FW.

Change-Id: Id5940dc12a39e7d2a8e7469be9a138eb40024cb5
CRs-Fixed: 3568364

core/hdd/inc/wlan_hdd_assoc.h

@@ -354,15 +354,16 @@ hdd_indicate_ese_bcn_report_no_results(const struct hdd_adapter *adapter,
 
 /**
  * hdd_change_peer_state() - change peer state
- * @adapter: HDD adapter
+ * @link_info: Link info pointer of VDEV in adapter
  * @peer_mac_addr: Peer MAC address
  * @sta_state: peer state
  *
  * Return: QDF status
  */
-QDF_STATUS hdd_change_peer_state(struct hdd_adapter *adapter,
+QDF_STATUS hdd_change_peer_state(struct wlan_hdd_link_info *link_info,
 				 uint8_t *peer_mac_addr,
 				 enum ol_txrx_peer_state sta_state);
+
 /**
  * hdd_update_dp_vdev_flags() - update datapath vdev flags
  * @cbk_data: callback data

core/hdd/src/wlan_hdd_assoc.c

@@ -1254,23 +1254,21 @@ void hdd_clear_roam_profile_ie(struct hdd_adapter *adapter)
 }
 
 #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2)
-static inline
-void hdd_set_unpause_queue(void *soc, struct hdd_adapter *adapter)
+static inline void hdd_set_unpause_queue(void *soc, uint8_t vdev_id)
 {
-	cdp_fc_vdev_unpause(soc, adapter->deflink->vdev_id,
-			    OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED,
-			    0);
+	cdp_fc_vdev_unpause(soc, vdev_id,
+			    OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED, 0);
 }
 #else
-static inline
-void hdd_set_unpause_queue(void *soc, struct hdd_adapter *adapter)
-{ }
+static inline void hdd_set_unpause_queue(void *soc, uint8_t vdev_id)
+{
+}
 #endif
 
 #ifdef FEATURE_WDS
 /**
  * hdd_config_wds_repeater_mode() - configures vdev for wds repeater mode
- * @adapter: pointer to adapter
+ * @link_info: Link info pointer in HDD adapter
  * @peer_addr: peer mac address
  *
  * Configure dp vdev to detect and drop multicast echo packets and enable
@@ -1278,35 +1276,37 @@ void hdd_set_unpause_queue(void *soc, struct hdd_adapter *adapter)
  *
  * Return: None
  */
-static void
-hdd_config_wds_repeater_mode(struct hdd_adapter *adapter, uint8_t *peer_addr)
+static void hdd_config_wds_repeater_mode(struct wlan_hdd_link_info *link_info,
+					 uint8_t *peer_addr)
 {
 	cdp_config_param_type vdev_param;
 	ol_txrx_soc_handle soc = cds_get_context(QDF_MODULE_ID_SOC);
 
 	vdev_param.cdp_vdev_param_mec = true;
-	if (cdp_txrx_set_vdev_param(soc, adapter->deflink->vdev_id,
+	if (cdp_txrx_set_vdev_param(soc, link_info->vdev_id,
 				    CDP_ENABLE_MEC, vdev_param))
 		hdd_debug("Failed to set MEC param on DP vdev");
 
 	hdd_nofl_info("Turn on 4 address for peer: " QDF_MAC_ADDR_FMT,
 		      QDF_MAC_ADDR_REF(peer_addr));
 	if (sme_set_peer_param(peer_addr, WMI_HOST_PEER_USE_4ADDR, true,
-			       adapter->deflink->vdev_id))
+			       link_info->vdev_id))
 		hdd_err("Failed to enable WDS on vdev");
 }
 #else
 static inline void
-hdd_config_wds_repeater_mode(struct hdd_adapter *adapter, uint8_t *peer_addr)
+hdd_config_wds_repeater_mode(struct wlan_hdd_link_info *link_info,
+			     uint8_t *peer_addr)
 {
 }
 #endif
 
-QDF_STATUS hdd_change_peer_state(struct hdd_adapter *adapter,
+QDF_STATUS hdd_change_peer_state(struct wlan_hdd_link_info *link_info,
 				 uint8_t *peer_mac,
 				 enum ol_txrx_peer_state sta_state)
 {
 	QDF_STATUS err;
+	struct hdd_adapter *adapter = link_info->adapter;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 
@@ -1316,23 +1316,22 @@ QDF_STATUS hdd_change_peer_state(struct hdd_adapter *adapter,
 		return QDF_STATUS_E_FAULT;
 	}
 
-	if (hdd_is_roam_sync_in_progress(hdd_ctx, adapter->deflink->vdev_id)) {
+	if (hdd_is_roam_sync_in_progress(hdd_ctx, link_info->vdev_id)) {
 		if (adapter->device_mode == QDF_STA_MODE &&
 		    (wlan_mlme_get_wds_mode(hdd_ctx->psoc) ==
 		    WLAN_WDS_MODE_REPEATER))
-			hdd_config_wds_repeater_mode(adapter, peer_mac);
+			hdd_config_wds_repeater_mode(link_info, peer_mac);
 
-		hdd_son_deliver_peer_authorize_event(adapter, peer_mac);
+		hdd_son_deliver_peer_authorize_event(link_info, peer_mac);
 		return QDF_STATUS_SUCCESS;
 	}
 
 	if (sta_state == OL_TXRX_PEER_STATE_AUTH) {
 		/* Reset scan reject params on successful set key */
 		hdd_debug("Reset scan reject params");
-		hdd_init_scan_reject_params(adapter->hdd_ctx);
+		hdd_init_scan_reject_params(hdd_ctx);
 
-		err = sme_set_peer_authorized(peer_mac,
-					      adapter->deflink->vdev_id);
+		err = sme_set_peer_authorized(peer_mac, link_info->vdev_id);
 		if (err != QDF_STATUS_SUCCESS) {
 			hdd_err("Failed to set the peer state to authorized");
 			return QDF_STATUS_E_FAULT;
@@ -1340,15 +1339,15 @@ QDF_STATUS hdd_change_peer_state(struct hdd_adapter *adapter,
 
 		if (adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
-			hdd_set_unpause_queue(soc, adapter);
+			hdd_set_unpause_queue(soc, link_info->vdev_id);
 		}
 
 		if (adapter->device_mode == QDF_STA_MODE &&
 		    (wlan_mlme_get_wds_mode(hdd_ctx->psoc) ==
 		    WLAN_WDS_MODE_REPEATER))
-			hdd_config_wds_repeater_mode(adapter, peer_mac);
+			hdd_config_wds_repeater_mode(link_info, peer_mac);
 
-		hdd_son_deliver_peer_authorize_event(adapter, peer_mac);
+		hdd_son_deliver_peer_authorize_event(link_info, peer_mac);
 	}
 	return QDF_STATUS_SUCCESS;
 }

core/hdd/src/wlan_hdd_cm_connect.c

@@ -185,7 +185,7 @@ void hdd_cm_set_peer_authenticate(struct wlan_hdd_link_info *link_info,
 		  QDF_MAC_ADDR_REF(bssid->bytes),
 		  is_auth_required ? "CONNECTED" : "AUTHENTICATED");
 
-	hdd_change_peer_state(link_info->adapter, bssid->bytes,
+	hdd_change_peer_state(link_info, bssid->bytes,
 			      is_auth_required ?
 			      OL_TXRX_PEER_STATE_CONN :
 			      OL_TXRX_PEER_STATE_AUTH);

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -619,7 +619,7 @@ QDF_STATUS hdd_softap_register_sta(struct wlan_hdd_link_info *link_info,
 		/* Connections that do not need Upper layer auth,
 		 * transition TL directly to 'Authenticated' state.
 		 */
-		qdf_status = hdd_change_peer_state(adapter,
+		qdf_status = hdd_change_peer_state(link_info,
 						   txrx_desc.peer_addr.bytes,
 						   OL_TXRX_PEER_STATE_AUTH);
 
@@ -634,7 +634,7 @@ QDF_STATUS hdd_softap_register_sta(struct wlan_hdd_link_info *link_info,
 			  ".  Changing TL state to CONNECTED at Join time",
 			 QDF_MAC_ADDR_REF(sta_info->sta_mac.bytes));
 
-		qdf_status = hdd_change_peer_state(adapter,
+		qdf_status = hdd_change_peer_state(link_info,
 						   txrx_desc.peer_addr.bytes,
 						   OL_TXRX_PEER_STATE_CONN);
 
@@ -774,7 +774,7 @@ static QDF_STATUS hdd_softap_change_per_sta_state(struct hdd_adapter *adapter,
 		qdf_mem_copy(&mac_addr, sta_mac, QDF_MAC_ADDR_SIZE);
 
 	qdf_status =
-		hdd_change_peer_state(adapter, mac_addr.bytes, state);
+		hdd_change_peer_state(adapter->deflink, mac_addr.bytes, state);
 	hdd_debug("Station " QDF_MAC_ADDR_FMT " changed to state %d",
 		  QDF_MAC_ADDR_REF(mac_addr.bytes), state);
 

core/hdd/src/wlan_hdd_son.c

@@ -2746,7 +2746,7 @@ int hdd_son_deliver_assoc_disassoc_event(struct hdd_adapter *adapter,
 	return ret;
 }
 
-void hdd_son_deliver_peer_authorize_event(struct hdd_adapter *adapter,
+void hdd_son_deliver_peer_authorize_event(struct wlan_hdd_link_info *link_info,
 					  uint8_t *peer_mac)
 {
 	struct wlan_objmgr_peer *peer;
@@ -2754,11 +2754,11 @@ void hdd_son_deliver_peer_authorize_event(struct hdd_adapter *adapter,
 	struct wlan_objmgr_vdev *vdev;
 	struct wlan_objmgr_psoc *psoc;
 
-	if (!adapter || adapter->device_mode != QDF_SAP_MODE) {
+	if (link_info->adapter->device_mode != QDF_SAP_MODE) {
 		hdd_err("Non SAP vdev");
 		return;
 	}
-	vdev = hdd_objmgr_get_vdev_by_user(adapter->deflink, WLAN_SON_ID);
+	vdev = hdd_objmgr_get_vdev_by_user(link_info, WLAN_SON_ID);
 	if (!vdev) {
 		hdd_err("null vdev");
 		return;

core/hdd/src/wlan_hdd_son.h

@@ -80,14 +80,13 @@ int hdd_son_deliver_assoc_disassoc_event(struct hdd_adapter *adapter,
 					 enum assoc_disassoc_event flag);
 /**
  * hdd_son_deliver_peer_authorize_event() - Deliver peer auth event to SON
- * @adapter: objmgr adapter
+ * @link_info: Link info pointer in HDD adapter
  * @peer_mac: Peer mac address
  *
  * Return: Void
  */
-void
-hdd_son_deliver_peer_authorize_event(struct hdd_adapter *adapter,
-				     uint8_t *peer_mac);
+void hdd_son_deliver_peer_authorize_event(struct wlan_hdd_link_info *link_info,
+					  uint8_t *peer_mac);
 
 /**
  * hdd_son_send_set_wifi_generic_command() - Send Generic SET command to SON
@@ -161,7 +160,7 @@ static inline int
 }
 
 static inline void
-hdd_son_deliver_peer_authorize_event(struct hdd_adapter *adapter,
+hdd_son_deliver_peer_authorize_event(struct wlan_hdd_link_info *link_info,
 				     uint8_t *peer_mac)
 {
 }