Browse Source

qcacld-3.0: Replace HDD_SESSION_ID_INVALID

The macro HDD_SESSION_ID_INVALID uses legacy nomenclature and
replicates the semantics of converged macro WLAN_UMAC_VDEV_ID_MAX,
so replace it.

Change-Id: I312b0599a31b530abe5c072a50673ac0198da877
CRs-Fixed: 2410833
Jeff Johnson 6 years ago
parent
commit
912b1bb540

+ 0 - 3
core/hdd/inc/wlan_hdd_main.h

@@ -353,9 +353,6 @@ enum hdd_driver_flags {
 
 #define PRE_CAC_SSID "pre_cac_ssid"
 
-/* session ID invalid */
-#define HDD_SESSION_ID_INVALID    0xFF
-
 #define SCAN_REJECT_THRESHOLD_TIME 300000 /* Time is in msec, equal to 5 mins */
 #define SCAN_REJECT_THRESHOLD 15
 

+ 9 - 9
core/hdd/src/wlan_hdd_cfg80211.c

@@ -10930,15 +10930,8 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy,
 	if (0 != err)
 		return err;
 
-	err = wlan_cfg80211_nla_parse(tb, STATS_SET_MAX, data, data_len,
-				      qca_wlan_vendor_set_nud_stats);
-	if (err) {
-		hdd_err("STATS_SET_START ATTR");
-		return err;
-	}
-
-	if (adapter->vdev_id == HDD_SESSION_ID_INVALID) {
-		hdd_err("Invalid session id");
+	if (adapter->vdev_id == WLAN_UMAC_VDEV_ID_MAX) {
+		hdd_err("Invalid vdev id");
 		return -EINVAL;
 	}
 
@@ -10947,6 +10940,13 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
+	err = wlan_cfg80211_nla_parse(tb, STATS_SET_MAX, data, data_len,
+				      qca_wlan_vendor_set_nud_stats);
+	if (err) {
+		hdd_err("STATS_SET_START ATTR");
+		return err;
+	}
+
 	if (tb[STATS_SET_START]) {
 		/* tracking is enabled for stats other than arp. */
 		if (tb[STATS_SET_DATA_PKT_INFO]) {

+ 1 - 1
core/hdd/src/wlan_hdd_hostapd.c

@@ -3418,7 +3418,7 @@ struct hdd_adapter *hdd_wlan_create_ap_dev(struct hdd_context *hdd_ctx,
 	adapter->dev = dev;
 	adapter->hdd_ctx = hdd_ctx;
 	adapter->magic = WLAN_HDD_ADAPTER_MAGIC;
-	adapter->vdev_id = HDD_SESSION_ID_INVALID;
+	adapter->vdev_id = WLAN_UMAC_VDEV_ID_MAX;
 
 	hdd_debug("dev = %pK, adapter = %pK, concurrency_mode=0x%x",
 		dev, adapter,

+ 4 - 4
core/hdd/src/wlan_hdd_main.c

@@ -2309,7 +2309,7 @@ int hdd_start_adapter(struct hdd_adapter *adapter)
 	if (hdd_set_fw_params(adapter))
 		hdd_err("Failed to set the FW params for the adapter!");
 
-	if (adapter->vdev_id != HDD_SESSION_ID_INVALID) {
+	if (adapter->vdev_id != WLAN_UMAC_VDEV_ID_MAX) {
 		ret = wlan_hdd_cfg80211_register_frames(adapter);
 		if (ret < 0) {
 			hdd_err("Failed to register frames - ret %d", ret);
@@ -3806,7 +3806,7 @@ hdd_alloc_station_adapter(struct hdd_context *hdd_ctx, tSirMacAddr mac_addr,
 	adapter->dev = dev;
 	adapter->hdd_ctx = hdd_ctx;
 	adapter->magic = WLAN_HDD_ADAPTER_MAGIC;
-	adapter->vdev_id = HDD_SESSION_ID_INVALID;
+	adapter->vdev_id = WLAN_UMAC_VDEV_ID_MAX;
 
 	qdf_status = qdf_event_create(&adapter->qdf_session_open_event);
 	if (QDF_IS_STATUS_ERROR(qdf_status))
@@ -4172,7 +4172,7 @@ int hdd_vdev_create(struct hdd_adapter *adapter,
 			 * SSR/PDR has caused shutdown, which has forcefully
 			 * set the event. Return without the closing session.
 			 */
-			adapter->vdev_id = HDD_SESSION_ID_INVALID;
+			adapter->vdev_id = WLAN_UMAC_VDEV_ID_MAX;
 			hdd_err("Session open event forcefully set");
 			return -EINVAL;
 		}
@@ -5343,7 +5343,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
 
 	hdd_enter();
 
-	if (adapter->vdev_id != HDD_SESSION_ID_INVALID)
+	if (adapter->vdev_id != WLAN_UMAC_VDEV_ID_MAX)
 		wlan_hdd_cfg80211_deregister_frames(adapter);
 
 	hdd_nud_ignore_tracking(adapter, true);

+ 1 - 1
core/hdd/src/wlan_hdd_object_manager.c

@@ -306,7 +306,7 @@ int hdd_objmgr_release_and_destroy_vdev(struct hdd_adapter *adapter)
 	qdf_spin_lock_bh(&adapter->vdev_lock);
 	vdev = adapter->vdev;
 	adapter->vdev = NULL;
-	adapter->vdev_id = HDD_SESSION_ID_INVALID;
+	adapter->vdev_id = WLAN_UMAC_VDEV_ID_MAX;
 	qdf_spin_unlock_bh(&adapter->vdev_lock);
 
 	QDF_BUG(vdev);