From 36a0abf03b08f9bf44ea1f71213a4f3e8967ff18 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 20 May 2018 11:24:25 -0700 Subject: [PATCH] qcacld-3.0: Replace new instances of tQDF_ADAPTER_MODE Previously change "qcacld-3.0: Use enum QDF_OPMODE", Change-Id Ic6f663dac11a100f168b2626c7c0fbcaccbfca4f, replaced all instances of tQDF_ADAPTER_MODE to QDF_OPMODE in the qcacld-3.0 project. However since tQDF_ADAPTER_MODE was originally defined in a common project, and not all references to it could be immediately removed, a legacy definition was left with the expectation that it would be removed when all references to it had been updated. Unfortunately new instances of using tQDF_ADAPTER_MODE have been subsequently added to the project, so replace them with QDF_OPMODE. Change-Id: I71cead84151cc0411f7cc5cc13a87a281e7502c0 CRs-Fixed: 2245247 --- components/ipa/core/inc/wlan_ipa_priv.h | 2 +- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/ipa/core/inc/wlan_ipa_priv.h b/components/ipa/core/inc/wlan_ipa_priv.h index 37d8a9be407d..a931a5793416 100644 --- a/components/ipa/core/inc/wlan_ipa_priv.h +++ b/components/ipa/core/inc/wlan_ipa_priv.h @@ -303,7 +303,7 @@ struct wlan_ipa_iface_context { uint8_t iface_id; /* This iface ID */ qdf_netdev_t dev; - enum tQDF_ADAPTER_MODE device_mode; + enum QDF_OPMODE device_mode; uint8_t sta_id; /* This iface station ID */ uint8_t session_id; qdf_spinlock_t interface_lock; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 9c358792aa8d..5bf79f8a72f9 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2061,7 +2061,7 @@ struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx, * * Return: Device mode */ -enum tQDF_ADAPTER_MODE hdd_get_device_mode(uint32_t session_id); +enum QDF_OPMODE hdd_get_device_mode(uint32_t session_id); void hdd_deinit_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter, bool rtnl_held); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index c7a493bb9694..7cf51112dd02 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6235,7 +6235,7 @@ struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx, return NULL; } -enum tQDF_ADAPTER_MODE hdd_get_device_mode(uint32_t session_id) +enum QDF_OPMODE hdd_get_device_mode(uint32_t session_id) { struct hdd_context *hdd_ctx; struct hdd_adapter *adapter;