Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba3f7f04 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2d68ba9

include/net/flow.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};

include/net/inet_connection_sock.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/inet_connection_sock.c

+1 −4
Original line number Diff line number Diff line
@@ -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,

net/ipv4/route.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

}