ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 4 insertions, 10 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index ab4f44c9bb2..25428d0c50c 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -508,7 +508,7 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
         struct dst_entry *dst;
         struct flowi4 fl4;
 
-        dst = inet_csk_route_req(sk, &fl4, req, false);
+        dst = inet_csk_route_req(sk, &fl4, req);
         if (dst == NULL)
                 goto out;
 
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 0a290d719bc..db0cf17c00f 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -368,8 +368,7 @@ EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);
 
 struct dst_entry *inet_csk_route_req(struct sock *sk,
                                      struct flowi4 *fl4,
-                                     const struct request_sock *req,
-                                     bool nocache)
+                                     const struct request_sock *req)
 {
         struct rtable *rt;
         const struct inet_request_sock *ireq = inet_rsk(req);
@@ -377,8 +376,6 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
         struct net *net = sock_net(sk);
         int flags = inet_sk_flowi_flags(sk);
 
-        if (nocache)
-                flags |= FLOWI_FLAG_RT_NOCACHE;
         flowi4_init_output(fl4, sk->sk_bound_dev_if, sk->sk_mark,
                            RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
                            sk->sk_protocol,
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 97cca8a03d9..7e1c0ed0ef7 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1836,9 +1836,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
 
         rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0);
 
-        if (fl4->flowi4_flags & FLOWI_FLAG_RT_NOCACHE)
-                rth->dst.flags |= DST_NOCACHE;
-
         return rth;
 }
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 1d8b75a5898..59110caeb07 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -824,7 +824,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst,
         struct sk_buff * skb;
 
         /* First, grab a route. */
-        if (!dst && (dst = inet_csk_route_req(sk, &fl4, req, nocache)) == NULL)
+        if (!dst && (dst = inet_csk_route_req(sk, &fl4, req)) == NULL)
                 return -1;
 
         skb = tcp_make_synack(sk, dst, req, rvp);
@@ -1378,7 +1378,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                  */
                 if (tmp_opt.saw_tstamp &&
                     tcp_death_row.sysctl_tw_recycle &&
-                    (dst = inet_csk_route_req(sk, &fl4, req, want_cookie)) != NULL &&
+                    (dst = inet_csk_route_req(sk, &fl4, req)) != NULL &&
                     fl4.daddr == saddr) {
                         if (!tcp_peer_is_proven(req, dst, true)) {
                                 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSPASSIVEREJECTED);