summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_cdg.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2025-11-18 10:16:55 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2025-11-18 10:16:55 +0300
commitf39b6c468c52745dbca9a842d91c8373fda208ab (patch)
tree67321e90bba55fcc0f3a05f3bd9abad449b2c030 /net/ipv4/tcp_cdg.c
parente08969c4d65ac31297fcb4d31d4808c789152f68 (diff)
parent6a23ae0a96a600d1d12557add110e0bb6e32730c (diff)
downloadlinux-f39b6c468c52745dbca9a842d91c8373fda208ab.tar.xz
Merge tag 'v6.18-rc6' into for-linus
Sync up with the mainline to bring in definition of INPUT_PROP_HAPTIC_TOUCHPAD.
Diffstat (limited to 'net/ipv4/tcp_cdg.c')
-rw-r--r--net/ipv4/tcp_cdg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c
index ba4d98e510e0..fbad6c35dee9 100644
--- a/net/ipv4/tcp_cdg.c
+++ b/net/ipv4/tcp_cdg.c
@@ -379,7 +379,7 @@ static void tcp_cdg_init(struct sock *sk)
/* We silently fall back to window = 1 if allocation fails. */
if (window > 1)
ca->gradients = kcalloc(window, sizeof(ca->gradients[0]),
- GFP_NOWAIT | __GFP_NOWARN);
+ GFP_NOWAIT);
ca->rtt_seq = tp->snd_nxt;
ca->shadow_wnd = tcp_snd_cwnd(tp);
}