A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Delete obsolete struct hdd_cfg80211_state" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-25 16:00:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3a94a31910
2 changed files with 0 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

32
core/hdd/inc/wlan_hdd_main.h
View file

@ -610,35 +610,6 @@ struct hdd_scan_req {
uint32_t scan_req_flags;
};
enum p2p_action_frame_state {
HDD_IDLE,
HDD_PD_REQ_ACK_PENDING,
HDD_GO_NEG_REQ_ACK_PENDING,
HDD_INVALID_STATE,
};
enum action_frm_type {
WLAN_HDD_GO_NEG_REQ,
WLAN_HDD_GO_NEG_RESP,
WLAN_HDD_GO_NEG_CNF,
WLAN_HDD_INVITATION_REQ,
WLAN_HDD_INVITATION_RESP,
WLAN_HDD_DEV_DIS_REQ,
WLAN_HDD_DEV_DIS_RESP,
WLAN_HDD_PROV_DIS_REQ,
WLAN_HDD_PROV_DIS_RESP,
};
struct hdd_cfg80211_state {
uint16_t current_freq;
enum p2p_action_frame_state actionFrmState;
/* is_go_neg_ack_received flag is set to 1 when
* the pending ack for GO negotiation req is
* received.
*/
bool is_go_neg_ack_received;
};
/**
* struct hdd_mon_set_ch_info - Holds monitor mode channel switch params
* @channel: Channel number.
@ -1154,8 +1125,6 @@ struct hdd_adapter {
#endif /* WLAN_FEATURE_TSF_PLUS */
#endif
struct hdd_cfg80211_state cfg80211State;
#ifdef WLAN_FEATURE_PACKET_FILTERING
struct hdd_multicast_addr_list mc_addr_list;
#endif
@ -1260,7 +1229,6 @@ struct hdd_adapter {
#define WLAN_HDD_GET_HAL_CTX(adapter) ((adapter)->hdd_ctx->hHal)
#define WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter) \
(&(adapter)->sessionCtx.ap.HostapdState)
#define WLAN_HDD_GET_CFG_STATE_PTR(adapter) (&(adapter)->cfg80211State)
#define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->sessionCtx.ap.sapContext)
#ifdef WLAN_FEATURE_NAN_DATAPATH

4
core/hdd/src/wlan_hdd_main.c
View file

@ -3944,8 +3944,6 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
struct hdd_adapter *adapter = NULL;
hdd_adapter_list_node_t *pHddAdapterNode = NULL;
QDF_STATUS status = QDF_STATUS_E_FAILURE;
struct hdd_cfg80211_state *cfgState;
if (hdd_ctx->current_intf_count >= hdd_ctx->max_intf_count) {
/*
@ -4112,8 +4110,6 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
INIT_WORK(&adapter->scan_block_work, wlan_hdd_cfg80211_scan_block_cb);
cfgState = WLAN_HDD_GET_CFG_STATE_PTR(adapter);
if (QDF_STATUS_SUCCESS == status) {
/* Add it to the hdd's session list. */
pHddAdapterNode =