Przeglądaj źródła

qcacld-3.0: Remove session_id from struct pmo_wow_add_pattern

The session_id field in struct pmo_wow_add_pattern does not serve any
purpose, so remove it.

Change-Id: I477b74c1360f124fb493440a8289fb2a4382c6d5
CRs-Fixed: 2404828
Jeff Johnson 6 lat temu
rodzic
commit
e723995185

+ 1 - 1
components/pmo/core/src/wlan_pmo_wow.c

@@ -95,7 +95,7 @@ QDF_STATUS pmo_core_add_wow_user_pattern(struct wlan_objmgr_vdev *vdev,
 	pmo_set_wow_default_ptrn(vdev_ctx, 0);
 
 	pmo_debug("Add user passed wow pattern id %d vdev id %d",
-		  ptrn->pattern_id, ptrn->session_id);
+		  ptrn->pattern_id, wlan_vdev_get_id(vdev));
 	/*
 	 * Convert received pattern mask value from bit representation
 	 * to byte representation.

+ 1 - 3
components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019 The Linux Foundation. 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
@@ -249,7 +249,6 @@ struct pmo_wow {
  * @pattern: pattern byte stream
  * @pattern_mask_size: pattern mask size
  * @pattern_mask: pattern mask
- * @session_id: session id
  */
 struct pmo_wow_add_pattern {
 	uint8_t pattern_id;
@@ -258,7 +257,6 @@ struct pmo_wow_add_pattern {
 	uint8_t pattern[PMO_WOWL_BCAST_PATTERN_MAX_SIZE];
 	uint8_t pattern_mask_size;
 	uint8_t pattern_mask[PMO_WOWL_BCAST_PATTERN_MAX_SIZE];
-	uint8_t session_id;
 };
 
 /**

+ 0 - 4
core/hdd/src/wlan_hdd_wowl.c

@@ -104,7 +104,6 @@ bool hdd_add_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
 	int i, empty_slot, len, offset;
 	QDF_STATUS status;
 	const char *temp;
-	uint8_t sessionId = adapter->vdev_id;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	uint8_t num_filters;
 	bool invalid_ptrn = false;
@@ -225,7 +224,6 @@ bool hdd_add_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
 		g_hdd_wowl_ptrns[empty_slot][len] = '\0';
 		localPattern.pattern_id = empty_slot;
 		localPattern.pattern_byte_offset = 0;
-		localPattern.session_id = sessionId;
 
 		/* Register the pattern downstream */
 		status = ucfg_pmo_add_wow_user_pattern(
@@ -321,7 +319,6 @@ bool hdd_add_wowl_ptrn_debugfs(struct hdd_adapter *adapter, uint8_t pattern_idx,
 {
 	struct pmo_wow_add_pattern localPattern;
 	QDF_STATUS qdf_ret_status;
-	uint8_t session_id = adapter->vdev_id;
 	uint16_t pattern_len, mask_len, i;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
@@ -351,7 +348,6 @@ bool hdd_add_wowl_ptrn_debugfs(struct hdd_adapter *adapter, uint8_t pattern_idx,
 	localPattern.pattern_id = pattern_idx;
 	localPattern.pattern_byte_offset = pattern_offset;
 	localPattern.pattern_size = pattern_len;
-	localPattern.session_id = session_id;
 
 	if (localPattern.pattern_size > PMO_WOWL_BCAST_PATTERN_MAX_SIZE) {
 		hdd_err("WoW pattern size (%d) greater than max (%d)",