diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-01 15:25:00 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-01 15:25:00 +0300 |
| commit | 13463f731fbbadbd6d7610600d4924c3707e4ecd (patch) | |
| tree | a1b566c17046bd788fbb8dbeef715aa5aa38b343 /include | |
| parent | 456bfd9dc8a11213f665a28d49010ee1d31547c4 (diff) | |
| parent | e918c137db4083e59866d2aaa603887cbd9969bf (diff) | |
| download | linux-13463f731fbbadbd6d7610600d4924c3707e4ecd.tar.xz | |
Merge branch 'mptcp-mem-scheduling'
Mat Martineau says:
====================
mptcp: Updates for mem scheduling and SK_RECLAIM
In the "net: reduce tcp_memory_allocated inflation" series (merge commit
e10b02ee5b6c), Eric Dumazet noted that "Removal of SK_RECLAIM_CHUNK and
SK_RECLAIM_THRESHOLD is left to MPTCP maintainers as a follow up."
Patches 1-3 align MPTCP with the above TCP changes to forward memory
allocation, reclaim, and memory scheduling.
Patch 4 removes the SK_RECLAIM_* macros as Eric requested.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 40bbd0e8925b..0dd43c3df49b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1619,11 +1619,6 @@ static inline void sk_mem_charge(struct sock *sk, int size) sk->sk_forward_alloc -= size; } -/* the following macros control memory reclaiming in mptcp_rmem_uncharge() - */ -#define SK_RECLAIM_THRESHOLD (1 << 21) -#define SK_RECLAIM_CHUNK (1 << 20) - static inline void sk_mem_uncharge(struct sock *sk, int size) { if (!sk_has_account(sk)) |