diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-12 19:01:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-12 19:01:36 -0700 |
| commit | 182dd7f2c3abff7c535963da3b8ff91ae0b159b8 (patch) | |
| tree | cfa578295d9dcd4fe819990607a478441a4fea32 | |
| parent | d6f30ab8c3368838e95133b8c0b5d19e72b7332c (diff) | |
| parent | b874144c62449c5bf477035509a753c2758ebae6 (diff) | |
Merge "qcacld-2.0: Fix beacon rate not retained after change channel issue"
| -rw-r--r-- | CORE/MAC/src/pe/lim/limSendMessages.c | 3 | ||||
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 1 | ||||
| -rw-r--r-- | CORE/WDA/inc/legacy/halMsgApi.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CORE/MAC/src/pe/lim/limSendMessages.c b/CORE/MAC/src/pe/lim/limSendMessages.c index 3f0655c32077..f2eee7bfc33e 100644 --- a/CORE/MAC/src/pe/lim/limSendMessages.c +++ b/CORE/MAC/src/pe/lim/limSendMessages.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014, 2016, 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, 2016, 2017, 2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -273,6 +273,7 @@ tSirRetStatus limSendSwitchChnlParams(tpAniSirGlobal pMac, pChnlParams->restart_on_chan_switch = is_restart; pChnlParams->reduced_beacon_interval = pMac->sap.SapDfsInfo.reduced_beacon_interval; + pChnlParams->beacon_tx_rate = pSessionEntry->beacon_tx_rate; if (pSessionEntry->sub20_channelwidth == SUB20_MODE_5MHZ) pChnlParams->channelwidth = CH_WIDTH_5MHZ; diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 316985bc63b4..ca0e07833703 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -15631,6 +15631,7 @@ static void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) " interval reset req", __func__); } } + req.beacon_tx_rate= params->beacon_tx_rate; } if ((VOS_MONITOR_MODE == vos_get_conparam()) && wma_is_vdev_up(0)) { diff --git a/CORE/WDA/inc/legacy/halMsgApi.h b/CORE/WDA/inc/legacy/halMsgApi.h index cfe4984a7802..3de568bd1de8 100644 --- a/CORE/WDA/inc/legacy/halMsgApi.h +++ b/CORE/WDA/inc/legacy/halMsgApi.h @@ -1043,6 +1043,7 @@ typedef struct uint32_t channelwidth; uint16_t reduced_beacon_interval; + uint16_t beacon_tx_rate; }tSwitchChannelParams, *tpSwitchChannelParams; typedef struct CSAOffloadParams { |