Browse Source

qcacmn: Add vdev as argument to wlan_serialization_comp_info_cb

Add an additional argument to wlan_serialization_comp_info_cb to pass
the vdev information while filling the information required to apply the
rules.

Change-Id: I44dadc01108e746fd2ce6353a90cdf9401dd6d06
CRs-Fixed: 2090987
Varun Reddy Yeturu 7 years ago
parent
commit
eea59a38ac

+ 2 - 1
umac/cmn_services/serialization/inc/wlan_serialization_api.h

@@ -94,6 +94,7 @@ typedef QDF_STATUS (*wlan_serialization_cmd_callback) (void *wlan_cmd,
 
 /**
  * wlan_serialization_comp_info_cb() - callback to fill the rules information
+ * @vdev: VDEV object for which the command has been received
  * @comp_info: Information filled by the component
  *
  * This callback is registered dynamically by the component with the
@@ -103,7 +104,7 @@ typedef QDF_STATUS (*wlan_serialization_cmd_callback) (void *wlan_cmd,
  *
  * Return: None
  */
-typedef void (*wlan_serialization_comp_info_cb)(
+typedef void (*wlan_serialization_comp_info_cb)(struct wlan_objmgr_vdev *vdev,
 		union wlan_serialization_rules_info *comp_info);
 
 /**

+ 2 - 1
umac/cmn_services/serialization/src/wlan_serialization_api.c

@@ -227,7 +227,8 @@ wlan_serialization_request(struct wlan_serialization_command *cmd)
 	for (comp_id = 0; comp_id < WLAN_UMAC_COMP_ID_MAX; comp_id++) {
 		if (!ser_soc_obj->comp_info_cb[cmd->cmd_type][comp_id])
 			continue;
-		(ser_soc_obj->comp_info_cb[cmd->cmd_type][comp_id])(&info);
+		(ser_soc_obj->comp_info_cb[cmd->cmd_type][comp_id])(cmd->vdev,
+			&info);
 		if (!ser_soc_obj->apply_rules_cb[cmd->cmd_type])
 			continue;
 		if (!ser_soc_obj->apply_rules_cb[cmd->cmd_type](&info, comp_id))

+ 1 - 1
umac/tdls/core/src/wlan_tdls_main.c

@@ -1332,7 +1332,7 @@ return_success:
 	return status;
 }
 
-void tdls_scan_serialization_comp_info_cb(
+void tdls_scan_serialization_comp_info_cb(struct wlan_objmgr_vdev *vdev,
 		union wlan_serialization_rules_info *comp_info)
 {
 	struct tdls_soc_priv_obj *tdls_soc;

+ 2 - 1
umac/tdls/core/src/wlan_tdls_main.h

@@ -681,12 +681,13 @@ void tdls_scan_done_callback(struct tdls_soc_priv_obj *tdls_soc);
 
 /**
  * tdls_scan_serialization_comp_info_cb() - callback for scan start
+ * @vdev: VDEV on which the scan command is being processed
  * @comp_info: serialize rules info
  *
  * Return: negative = caller should stop and return error code immediately
  *         1 = caller can continue to scan
  */
-void tdls_scan_serialization_comp_info_cb(
+void tdls_scan_serialization_comp_info_cb(struct wlan_objmgr_vdev *vdev,
 		union wlan_serialization_rules_info *comp_info);
 
 /**