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

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

ipv4: Kill can_sleep arg to ip_route_output_flow() 



This boolean state is now available in the flow flags.

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

drivers/infiniband/hw/cxgb3/iwch_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip, 
			  }

	};



	if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))

	if (ip_route_output_flow(&init_net, &rt, &fl, NULL))

		return NULL;

	return rt;

}

drivers/infiniband/hw/cxgb4/cm.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static struct rtable *find_route(struct c4iw_dev *dev, __be32 local_ip, 
			  }

	};



	if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))

	if (ip_route_output_flow(&init_net, &rt, &fl, NULL))

		return NULL;

	return rt;

}

drivers/scsi/cxgbi/libcxgbi.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static struct rtable *find_route_ipv4(__be32 saddr, __be32 daddr, 
			}

	};



	if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))

	if (ip_route_output_flow(&init_net, &rt, &fl, NULL))

		return NULL;



	return rt;

include/net/route.h

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ extern void rt_cache_flush(struct net *net, int how); 
extern void		rt_cache_flush_batch(struct net *net);

extern int		__ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);

extern int		ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);

extern int		ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, bool can_sleep);

extern int		ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk);



extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,

				 u8 tos, struct net_device *devin, bool noref);
@@ -198,7 +198,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, 
		*rp = NULL;

	}

	security_sk_classify_flow(sk, &fl);

	return ip_route_output_flow(net, rp, &fl, sk, can_sleep);

	return ip_route_output_flow(net, rp, &fl, sk);

}



static inline int ip_route_newports(struct rtable **rp, u8 protocol,
@@ -222,7 +222,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol, 
		ip_rt_put(*rp);

		*rp = NULL;

		security_sk_classify_flow(sk, &fl);

		return ip_route_output_flow(sock_net(sk), rp, &fl, sk, false);

		return ip_route_output_flow(sock_net(sk), rp, &fl, sk);

	}

	return 0;

}

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, 
			  };



	security_skb_classify_flow(skb, &fl);

	if (ip_route_output_flow(net, &rt, &fl, sk, false)) {

	if (ip_route_output_flow(net, &rt, &fl, sk)) {

		IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);

		return NULL;

	}