Merge "msm: ipa3: Fix the agg_byte_limit update for ioctl_v2"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
fca54c539f
@@ -3917,16 +3917,20 @@ static void ipa3_set_aggr_limit(struct ipa_sys_connect_params *in,
|
||||
u32 *aggr_byte_limit = &in->ipa_ep_cfg.aggr.aggr_byte_limit;
|
||||
u32 adjusted_sz;
|
||||
|
||||
if (sys->ext_ioctl_v2) {
|
||||
if (ipa3_ctx->ipa_wan_skb_page) {
|
||||
IPAERR("set rx_buff_sz config from netmngr %lu\n", (unsigned long)
|
||||
sys->buff_size);
|
||||
sys->rx_buff_sz = IPA_GENERIC_RX_BUFF_SZ(sys->buff_size);
|
||||
*aggr_byte_limit = IPA_ADJUST_AGGR_BYTE_LIMIT(*aggr_byte_limit);
|
||||
} else {
|
||||
adjusted_sz = ipa_adjust_ra_buff_base_sz(*aggr_byte_limit);
|
||||
IPAERR("get close-by %u\n", adjusted_sz);
|
||||
IPAERR("set default rx_buff_sz %lu\n", (unsigned long)
|
||||
IPA_GENERIC_RX_BUFF_SZ(adjusted_sz));
|
||||
sys->rx_buff_sz = IPA_GENERIC_RX_BUFF_SZ(adjusted_sz);
|
||||
*aggr_byte_limit = sys->rx_buff_sz < *aggr_byte_limit ?
|
||||
IPA_ADJUST_AGGR_BYTE_LIMIT(sys->rx_buff_sz) :
|
||||
IPA_ADJUST_AGGR_BYTE_LIMIT(*aggr_byte_limit);
|
||||
}
|
||||
|
||||
/* disable ipa_status */
|
||||
@@ -3935,10 +3939,6 @@ static void ipa3_set_aggr_limit(struct ipa_sys_connect_params *in,
|
||||
if (in->client == IPA_CLIENT_APPS_WAN_COAL_CONS)
|
||||
in->ipa_ep_cfg.aggr.aggr_hard_byte_limit_en = 1;
|
||||
|
||||
*aggr_byte_limit = sys->rx_buff_sz < *aggr_byte_limit ?
|
||||
IPA_ADJUST_AGGR_BYTE_LIMIT(sys->rx_buff_sz) :
|
||||
IPA_ADJUST_AGGR_BYTE_LIMIT(*aggr_byte_limit);
|
||||
|
||||
IPADBG("set aggr_limit %lu\n", (unsigned long) *aggr_byte_limit);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user