Revert "qcacld-3.0: Disable LDPC capability of peer"

This reverts Change-Id:  fb8137a35a.

Change-Id: I8a57cde45b3408ab66c26ed8079bde9ae5b09431
CRs-Fixed: 2604856
This commit is contained in:
Wu Gao 2016-06-29 12:03:56 +08:00 committed by nshrivas
parent 1d5e37cb22
commit 498b684222
3 changed files with 5 additions and 13 deletions

View File

@ -117,14 +117,12 @@ void wma_he_update_tgt_services(struct wmi_unified *wmi_handle,
/**
* wma_populate_peer_he_cap() - populate peer HE capabilities in peer assoc cmd
* @wma: pointer to wma handle
* @peer: pointer to peer assoc params
* @params: pointer to ADD STA params
*
* Return: None
*/
void wma_populate_peer_he_cap(tp_wma_handle wma,
struct peer_assoc_params *peer,
void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
tpAddStaParams params);
/**
@ -249,8 +247,7 @@ static inline void wma_he_update_tgt_services(struct wmi_unified *wmi_handle,
return;
}
static inline void wma_populate_peer_he_cap(tp_wma_handle wma,
struct peer_assoc_params *peer,
static inline void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
tpAddStaParams params)
{
}

View File

@ -1098,8 +1098,7 @@ static void wma_parse_he_ppet(int8_t *rcvd_ppet,
}
}
void wma_populate_peer_he_cap(tp_wma_handle wma,
struct peer_assoc_params *peer,
void wma_populate_peer_he_cap(struct peer_assoc_params *peer,
tpAddStaParams params)
{
tDot11fIEhe_cap *he_cap = &params->he_config;
@ -1107,15 +1106,12 @@ void wma_populate_peer_he_cap(tp_wma_handle wma,
uint32_t *phy_cap = peer->peer_he_cap_phyinfo;
uint32_t mac_cap[PSOC_HOST_MAX_MAC_SIZE] = {0}, he_ops = 0;
uint8_t temp, i, chan_width;
struct wma_txrx_node *intr = NULL;
if (params->he_capable)
peer->he_flag = 1;
else
return;
intr = &wma->interfaces[params->smesessionId];
/* HE MAC capabilities */
WMI_HECAP_MAC_HECTRL_SET(mac_cap[0], he_cap->htc_he);
WMI_HECAP_MAC_TWTREQ_SET(mac_cap[0], he_cap->twt_request);
@ -1172,8 +1168,7 @@ void wma_populate_peer_he_cap(tp_wma_handle wma,
WMI_HECAP_PHY_CBW_SET(phy_cap, chan_width);
WMI_HECAP_PHY_PREAMBLEPUNCRX_SET(phy_cap, he_cap->rx_pream_puncturing);
WMI_HECAP_PHY_COD_SET(phy_cap, he_cap->device_class);
temp = he_cap->ldpc_coding && intr->config.ldpc;
WMI_HECAP_PHY_LDPC_SET(phy_cap, temp);
WMI_HECAP_PHY_LDPC_SET(phy_cap, he_cap->ldpc_coding);
WMI_HECAP_PHY_LTFGIFORHE_SET(phy_cap, he_cap->he_1x_ltf_800_gi_ppdu);
WMI_HECAP_PHY_MIDAMBLETXRXMAXNSTS_SET(phy_cap,
he_cap->midamble_tx_rx_max_nsts);

View File

@ -1686,7 +1686,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
cmd->peer_nss = WMA_MAX_NSS;
}
wma_populate_peer_he_cap(wma, cmd, params);
wma_populate_peer_he_cap(cmd, params);
if (!wma_is_vdev_in_ap_mode(wma, params->smesessionId))
intr->nss = cmd->peer_nss;