From 142f9a6f59bf483376c67f583512745404210970 Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 25 Nov 2022 17:04:12 +0800 Subject: [PATCH] =?UTF-8?q?newip=E9=9D=99=E6=80=81=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangyanjun --- src/linux/net/newip/tcp_nip_input.c | 2 +- src/linux/net/newip/tcp_nip_output.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/linux/net/newip/tcp_nip_input.c b/src/linux/net/newip/tcp_nip_input.c index 7b2a3c8..7f6333f 100644 --- a/src/linux/net/newip/tcp_nip_input.c +++ b/src/linux/net/newip/tcp_nip_input.c @@ -1152,7 +1152,7 @@ static int tcp_nip_ack(struct sock *sk, const struct sk_buff *skb, int flag) if (after(ack, tp->snd_nxt)) return -1; - flag |= tcp_nip_ack_update_window(sk, skb, ack, ack_seq); + (void)tcp_nip_ack_update_window(sk, skb, ack, ack_seq); icsk->icsk_probes_out = 0; // probe0 cnt ntp->nip_keepalive_out = 0; // keepalive cnt tp->rcv_tstamp = tcp_jiffies32; diff --git a/src/linux/net/newip/tcp_nip_output.c b/src/linux/net/newip/tcp_nip_output.c index 7ef8b7b..5b34d6b 100644 --- a/src/linux/net/newip/tcp_nip_output.c +++ b/src/linux/net/newip/tcp_nip_output.c @@ -47,11 +47,6 @@ struct tcp_nip_out_options { static bool tcp_nip_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, int push_one, gfp_t gfp); -static void tcp_nip_event_data_sent(struct tcp_sock *tp, - struct sock *sk) -{ -} - /* Calculate MSS not accounting any TCP options. */ static inline int __tcp_nip_mtu_to_mss(struct sock *sk, int pmtu) { @@ -548,7 +543,6 @@ static int __tcp_nip_transmit_skb(struct sock *sk, struct sk_buff *skb, /* There's data to send */ if (skb->len != tcp_header_size) { - tcp_nip_event_data_sent(tp, sk); tp->data_segs_out += tcp_skb_pcount(skb); } -- Gitee