ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.

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

diff --git a/include/net/flow.h b/include/net/flow.h
index ce9cb7656b47494fc35e21e08195ba124b2d692a..e1dd5082ec7e43605e66ae0c48789ed1b4e68e35 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -21,7 +21,6 @@ struct flowi_common {
        __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC              0x01
 #define FLOWI_FLAG_CAN_SLEEP           0x02
-#define FLOWI_FLAG_RT_NOCACHE          0x04
        __u32   flowic_secid;
 };
 

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 2cf44b4ed2e6cf1ad4aedbebb30c3b802c9bfa33..5ee66f517b4f6c34734be9d5f6552439802a5a38 100644 (file)
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -250,8 +250,7 @@ extern int inet_csk_get_port(struct sock *sk, unsigned short snum);
 
 extern 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);
 extern struct dst_entry* inet_csk_route_child_sock(struct sock *sk,
                                                   struct sock *newsk,
                                                   const struct request_sock *req);

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index ab4f44c9bb21004ef3152e50c99e4409f6f1e24a..25428d0c50c96a5ec622cbf9e5651de1e2ebe2e9 100644 (file)
--- 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 0a290d719bc782a4c61e3e7d5054a6d6c884fc25..db0cf17c00f7048030d4dcea41e2d8f088391cc1 100644 (file)
--- 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 97cca8a03d94a8c3a40c2f5d070d15131b1afb2f..7e1c0ed0ef701dbcd2feba7573efacf336426672 100644 (file)
--- 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 1d8b75a58981a211c6cfa8bcb30af673f7a71ffe..59110caeb074a68b070684c87e1d6029f9c61876 100644 (file)
--- 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);