diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h index ab9a01109e52..d1addb76dd0a 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h @@ -143,27 +143,27 @@ struct wlan_objmgr_pdev_mlme { /** * struct wlan_objmgr_pdev_objmgr - pdev object object manager structure * @wlan_pdev_id: PDEV id - * @wlan_vdev_list: List maintains the VDEVs created on this PDEV * @wlan_vdev_count: VDEVs count * @max_vdev_count: Max no. of VDEVs supported by this PDEV + * @print_cnt: Count to throttle Logical delete prints + * @wlan_vdev_list: List maintains the VDEVs created on this PDEV * @wlan_peer_count: Peer count * @max_peer_count: Max Peer count * @wlan_psoc: back pointer to PSOC, its attached to * @ref_cnt: Ref count * @ref_id_dbg: Array to track Ref count - * @print_cnt: Count to throttle Logical delete prints */ struct wlan_objmgr_pdev_objmgr { uint8_t wlan_pdev_id; - qdf_list_t wlan_vdev_list; uint8_t wlan_vdev_count; uint8_t max_vdev_count; + uint8_t print_cnt; + qdf_list_t wlan_vdev_list; uint16_t wlan_peer_count; uint16_t max_peer_count; struct wlan_objmgr_psoc *wlan_psoc; qdf_atomic_t ref_cnt; qdf_atomic_t ref_id_dbg[WLAN_REF_ID_MAX]; - uint8_t print_cnt; }; /** @@ -192,7 +192,6 @@ struct wlan_objmgr_pdev { qdf_spinlock_t pdev_lock; }; - /** ** APIs to Create/Delete Global object APIs */ diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h index 8ee673c51595..8b7160eb3ea1 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h @@ -119,20 +119,20 @@ enum wlan_peer_state { * @peer_flags: PEER OP flags * @peer_type: Type of PEER, (STA/AP/etc.) * @phymode: phy mode of station - * @rssi: Last received RSSI value * @max_rate: Max Rate supported - * @seq_num: Sequence number * @state: State of the peer + * @seq_num: Sequence number + * @rssi: Last received RSSI value */ struct wlan_objmgr_peer_mlme { uint32_t peer_capinfo; uint32_t peer_flags; enum wlan_peer_type peer_type; enum wlan_phymode phymode; - int8_t rssi; uint32_t max_rate; - uint16_t seq_num; enum wlan_peer_state state; + uint16_t seq_num; + int8_t rssi; bool is_authenticated; }; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h index dcd16bd0abef..a003e70b994d 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h @@ -197,21 +197,21 @@ struct wlan_objmgr_psoc_regulatory { * @dot11_mode: Phy mode * @skip_dfs_chnl_in_p2p_search: Skip Dfs Channel in case of P2P * Search - * @dual_mac_feature_disable: Disable Dual MAC feature * @indoor_channel_support: Enable/disable sap on indoor channel * @optimize_chan_avoid_event: Optimize channel avoidance * indication coming from firmware * @band_capability: Preferred band (0:Both, 1:2G only, 2:5G only) + * @dual_mac_feature_disable: Disable Dual MAC feature */ struct wlan_objmgr_psoc_user_config { bool is_11d_support_enabled; bool is_11h_support_enabled; uint8_t dot11_mode; bool skip_dfs_chnl_in_p2p_search; - uint32_t dual_mac_feature_disable; bool indoor_channel_support; bool optimize_chan_avoid_event; uint8_t band_capability; + uint32_t dual_mac_feature_disable; }; /** @@ -240,35 +240,35 @@ struct wlan_objmgr_psoc_nif { * struct wlan_objmgr_psoc_objmgr - psoc object manager sub structure * @psoc_id: The PSOC's numeric Id * @wlan_pdev_count: PDEV count - * @wlan_pdev_list[]: PDEV list * @wlan_pdev_id_map: PDEV id map, to allocate free ids * @wlan_vdev_count: VDEV count * @max_vdev_count: Max no. of VDEVs supported by this PSOC - * @wlan_vdev_list[]: VDEV list - * @wlan_vdev_id_map[]: VDEV id map, to allocate free ids + * @print_cnt: Count to throttle Logical delete prints * @wlan_peer_count: PEER count * @max_peer_count: Max no. of peers supported by this PSOC + * @wlan_pdev_list[]: PDEV list + * @wlan_vdev_list[]: VDEV list + * @wlan_vdev_id_map[]: VDEV id map, to allocate free ids * @peer_list: Peer list * @ref_cnt: Ref count * @ref_id_dbg: Array to track Ref count - * @print_cnt: Count to throttle Logical delete prints * @qdf_dev: QDF Device */ struct wlan_objmgr_psoc_objmgr { uint8_t psoc_id; uint8_t wlan_pdev_count; - struct wlan_objmgr_pdev *wlan_pdev_list[WLAN_UMAC_MAX_PDEVS]; uint8_t wlan_pdev_id_map; uint8_t wlan_vdev_count; uint8_t max_vdev_count; - struct wlan_objmgr_vdev *wlan_vdev_list[WLAN_UMAC_PSOC_MAX_VDEVS]; - uint32_t wlan_vdev_id_map[2]; + uint8_t print_cnt; uint16_t wlan_peer_count; uint16_t max_peer_count; + struct wlan_objmgr_pdev *wlan_pdev_list[WLAN_UMAC_MAX_PDEVS]; + struct wlan_objmgr_vdev *wlan_vdev_list[WLAN_UMAC_PSOC_MAX_VDEVS]; + uint32_t wlan_vdev_id_map[2]; struct wlan_peer_list peer_list; qdf_atomic_t ref_cnt; qdf_atomic_t ref_id_dbg[WLAN_REF_ID_MAX]; - uint8_t print_cnt; qdf_device_t qdf_dev; }; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h index 6a57552861c8..34a212986dce 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h @@ -242,16 +242,16 @@ enum wlan_vdev_state { * struct wlan_vdev_create_params - Create params, HDD/OSIF passes this * structure While creating VDEV * @opmode: Opmode of VDEV - * @macaddr[]: MAC address * @flags: create flags * @osifp: OS structure + * @macaddr[]: MAC address * @mataddr[]: MAT address */ struct wlan_vdev_create_params { enum QDF_OPMODE opmode; - uint8_t macaddr[WLAN_MACADDR_LEN]; uint32_t flags; struct vdev_osif_priv *osifp; + uint8_t macaddr[WLAN_MACADDR_LEN]; uint8_t mataddr[WLAN_MACADDR_LEN]; }; @@ -282,43 +282,43 @@ struct wlan_channel { /** * struct wlan_objmgr_vdev_mlme - VDEV MLME specific sub structure * @vdev_opmode: Opmode of VDEV - * @ssid[]: SSID - * @ssid_len: SSID length + * @mlme_state: VDEV state * @bss_chan: BSS channel * @des_chan: Desired channel, for STA Desired may not be used * @nss: Num. Spatial streams * @tx_chainmask: Tx Chainmask * @rx_chainmask: Rx Chainmask - * @macaddr[]: VDEV self MAC address + * @tx_power: Tx power * @vdev_caps: VDEV capabilities * @vdev_feat_caps: VDEV feature caps * @vdev_feat_ext_caps: VDEV Extended feature caps * @max_rate: MAX rate * @tx_mgmt_rate: TX Mgmt. Rate - * @tx_power: Tx power - * @mlme_state: VDEV state * @vdev_op_flags: Operation flags * @mataddr[]: MAT address + * @macaddr[]: VDEV self MAC address + * @ssid[]: SSID + * @ssid_len: SSID length */ struct wlan_objmgr_vdev_mlme { enum QDF_OPMODE vdev_opmode; - char ssid[WLAN_SSID_MAX_LEN+1]; - uint8_t ssid_len; + enum wlan_vdev_state mlme_state; struct wlan_channel *bss_chan; /* Define wlan_channel */ struct wlan_channel *des_chan; /*TODO ??? */ uint8_t nss; uint8_t tx_chainmask; uint8_t rx_chainmask; - uint8_t macaddr[WLAN_MACADDR_LEN]; + uint8_t tx_power; uint32_t vdev_caps; uint32_t vdev_feat_caps; uint32_t vdev_feat_ext_caps; uint32_t max_rate; uint32_t tx_mgmt_rate; - uint8_t tx_power; - enum wlan_vdev_state mlme_state; uint32_t vdev_op_flags; uint8_t mataddr[WLAN_MACADDR_LEN]; + uint8_t macaddr[WLAN_MACADDR_LEN]; + char ssid[WLAN_SSID_MAX_LEN+1]; + uint8_t ssid_len; }; /** @@ -332,6 +332,7 @@ struct wlan_objmgr_vdev_nif { /** * struct wlan_objmgr_vdev_objmgr - vdev object manager sub structure * @vdev_id: VDEV id + * @print_cnt: Count to throttle Logical delete prints * @self_peer: Self PEER * @bss_peer: BSS PEER * @wlan_peer_list: PEER list @@ -341,10 +342,10 @@ struct wlan_objmgr_vdev_nif { * @c_flags: creation specific flags * @ref_cnt: Ref count * @ref_id_dbg: Array to track Ref count - * @print_cnt: Count to throttle Logical delete prints */ struct wlan_objmgr_vdev_objmgr { uint8_t vdev_id; + uint8_t print_cnt; struct wlan_objmgr_peer *self_peer; struct wlan_objmgr_peer *bss_peer; qdf_list_t wlan_peer_list; @@ -354,7 +355,6 @@ struct wlan_objmgr_vdev_objmgr { uint32_t c_flags; qdf_atomic_t ref_cnt; qdf_atomic_t ref_id_dbg[WLAN_REF_ID_MAX]; - uint8_t print_cnt; }; /**