| Message ID | 1376840078-6556-1-git-send-email-christoph.paasch@uclouvain.be |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, 2013-08-18 at 17:34 +0200, Christoph Paasch wrote: > The nocache-argument was used in tcp_v4_send_synack as an argument to > inet_csk_route_req. However, since ba3f7f04ef2b (ipv4: Kill > FLOWI_FLAG_RT_NOCACHE and associated code.) this is no more used. > > This patch removes the unsued argument from tcp_v4_send_synack. > > Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be> > --- > net/ipv4/tcp_ipv4.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Christoph Paasch <christoph.paasch@uclouvain.be> Date: Sun, 18 Aug 2013 17:34:38 +0200 > The nocache-argument was used in tcp_v4_send_synack as an argument to > inet_csk_route_req. However, since ba3f7f04ef2b (ipv4: Kill > FLOWI_FLAG_RT_NOCACHE and associated code.) this is no more used. > > This patch removes the unsued argument from tcp_v4_send_synack. > > Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 05a3d45..09d45d7 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -821,8 +821,7 @@ static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, */ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst, struct request_sock *req, - u16 queue_mapping, - bool nocache) + u16 queue_mapping) { const struct inet_request_sock *ireq = inet_rsk(req); struct flowi4 fl4; @@ -852,7 +851,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst, static int tcp_v4_rtx_synack(struct sock *sk, struct request_sock *req) { - int res = tcp_v4_send_synack(sk, NULL, req, 0, false); + int res = tcp_v4_send_synack(sk, NULL, req, 0); if (!res) TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);
The nocache-argument was used in tcp_v4_send_synack as an argument to inet_csk_route_req. However, since ba3f7f04ef2b (ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.) this is no more used. This patch removes the unsued argument from tcp_v4_send_synack. Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be> --- net/ipv4/tcp_ipv4.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)