Revert "net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined"
This reverts commit 3bf0715dbb
.
This commit is contained in:
parent
a5b7b870fc
commit
43674763e3
1 changed files with 2 additions and 3 deletions
|
@ -1385,6 +1385,7 @@ out:
|
||||||
*/
|
*/
|
||||||
static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb)
|
static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb)
|
||||||
{
|
{
|
||||||
|
const unsigned int max_scat = SG_MAX_SINGLE_ALLOC * PAGE_SIZE;
|
||||||
u8 compressed;
|
u8 compressed;
|
||||||
|
|
||||||
if (size <= SMC_BUF_MIN_SIZE)
|
if (size <= SMC_BUF_MIN_SIZE)
|
||||||
|
@ -1394,11 +1395,9 @@ static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb)
|
||||||
compressed = min_t(u8, ilog2(size) + 1,
|
compressed = min_t(u8, ilog2(size) + 1,
|
||||||
is_smcd ? SMCD_DMBE_SIZES : SMCR_RMBE_SIZES);
|
is_smcd ? SMCD_DMBE_SIZES : SMCR_RMBE_SIZES);
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_NO_SG_CHAIN
|
|
||||||
if (!is_smcd && is_rmb)
|
if (!is_smcd && is_rmb)
|
||||||
/* RMBs are backed by & limited to max size of scatterlists */
|
/* RMBs are backed by & limited to max size of scatterlists */
|
||||||
compressed = min_t(u8, compressed, ilog2((SG_MAX_SINGLE_ALLOC * PAGE_SIZE) >> 14));
|
compressed = min_t(u8, compressed, ilog2(max_scat >> 14));
|
||||||
#endif
|
|
||||||
|
|
||||||
return compressed;
|
return compressed;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue