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

Commit 0e0d44ab authored by Steffen Klassert's avatar Steffen Klassert
Browse files

net: Remove FLOWI_FLAG_CAN_SLEEP 



FLOWI_FLAG_CAN_SLEEP was used to notify xfrm about the posibility
to sleep until the needed states are resolved. This code is gone,
so FLOWI_FLAG_CAN_SLEEP is not needed anymore.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 5b8ef341

include/net/flow.h

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ struct flowi_common { 
	__u8	flowic_proto;

	__u8	flowic_flags;

#define FLOWI_FLAG_ANYSRC		0x01

#define FLOWI_FLAG_CAN_SLEEP		0x02

#define FLOWI_FLAG_KNOWN_NH		0x04

#define FLOWI_FLAG_KNOWN_NH		0x02

	__u32	flowic_secid;

};

include/net/ipv6.h

+2 −4
Original line number Diff line number Diff line
@@ -711,11 +711,9 @@ void ip6_flush_pending_frames(struct sock *sk); 


int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi6 *fl6);

struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

				      const struct in6_addr *final_dst,

				      bool can_sleep);

				      const struct in6_addr *final_dst);

struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

					 const struct in6_addr *final_dst,

					 bool can_sleep);

					 const struct in6_addr *final_dst);

struct dst_entry *ip6_blackhole_route(struct net *net,

				      struct dst_entry *orig_dst);

include/net/route.h

+3 −5
Original line number Diff line number Diff line
@@ -239,14 +239,12 @@ static inline char rt_tos2priority(u8 tos) 
static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32 src,

					 u32 tos, int oif, u8 protocol,

					 __be16 sport, __be16 dport,

					 struct sock *sk, bool can_sleep)

					 struct sock *sk)

{

	__u8 flow_flags = 0;



	if (inet_sk(sk)->transparent)

		flow_flags |= FLOWI_FLAG_ANYSRC;

	if (can_sleep)

		flow_flags |= FLOWI_FLAG_CAN_SLEEP;



	flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,

			   protocol, flow_flags, dst, src, dport, sport);
@@ -256,13 +254,13 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4, 
					      __be32 dst, __be32 src, u32 tos,

					      int oif, u8 protocol,

					      __be16 sport, __be16 dport,

					      struct sock *sk, bool can_sleep)

					      struct sock *sk)

{

	struct net *net = sock_net(sk);

	struct rtable *rt;



	ip_route_connect_init(fl4, dst, src, tos, oif, protocol,

			      sport, dport, sk, can_sleep);

			      sport, dport, sk);



	if (!dst || !src) {

		rt = __ip_route_output_key(net, fl4);

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,

			      RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,

			      IPPROTO_DCCP,

			      orig_sport, orig_dport, sk, true);

			      orig_sport, orig_dport, sk);

	if (IS_ERR(rt))

		return PTR_ERR(rt);

net/dccp/ipv6.c

+4 −4
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) 


	final_p = fl6_update_dst(&fl6, np->opt, &final);



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);

	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);

		dst = NULL;
@@ -301,7 +301,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) 
	security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6));



	/* sk = NULL, but it is safe for now. RST socket required. */

	dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL, false);

	dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);

	if (!IS_ERR(dst)) {

		skb_dst_set(skb, dst);

		ip6_xmit(ctl_sk, skb, &fl6, NULL, 0);
@@ -512,7 +512,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		fl6.fl6_sport = htons(ireq->ir_num);

		security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));



		dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);

		dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

		if (IS_ERR(dst))

			goto out;

	}
@@ -932,7 +932,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 


	final_p = fl6_update_dst(&fl6, np->opt, &final);



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);

	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);

		goto failure;