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

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

ipv4: Make caller provide on-stack flow key to ip_route_output_ports(). 



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

drivers/infiniband/hw/cxgb3/iwch_cm.c

+2 −1
Original line number Diff line number Diff line
@@ -338,8 +338,9 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip, 
				 __be16 peer_port, u8 tos)

{

	struct rtable *rt;

	struct flowi4 fl4;



	rt = ip_route_output_ports(&init_net, NULL, peer_ip, local_ip,

	rt = ip_route_output_ports(&init_net, &fl4, NULL, peer_ip, local_ip,

				   peer_port, local_port, IPPROTO_TCP,

				   tos, 0);

	if (IS_ERR(rt))

drivers/infiniband/hw/cxgb4/cm.c

+2 −1
Original line number Diff line number Diff line
@@ -315,8 +315,9 @@ static struct rtable *find_route(struct c4iw_dev *dev, __be32 local_ip, 
				 __be16 peer_port, u8 tos)

{

	struct rtable *rt;

	struct flowi4 fl4;



	rt = ip_route_output_ports(&init_net, NULL, peer_ip, local_ip,

	rt = ip_route_output_ports(&init_net, &fl4, NULL, peer_ip, local_ip,

				   peer_port, local_port, IPPROTO_TCP,

				   tos, 0);

	if (IS_ERR(rt))

drivers/net/pptp.c

+4 −2
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) 
	struct pptp_opt *opt = &po->proto.pptp;

	struct pptp_gre_header *hdr;

	unsigned int header_len = sizeof(*hdr);

	struct flowi4 fl4;

	int islcp;

	int len;

	unsigned char *data;
@@ -189,7 +190,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) 
	if (sk_pppox(po)->sk_state & PPPOX_DEAD)

		goto tx_error;



	rt = ip_route_output_ports(&init_net, NULL,

	rt = ip_route_output_ports(&init_net, &fl4, NULL,

				   opt->dst_addr.sin_addr.s_addr,

				   opt->src_addr.sin_addr.s_addr,

				   0, 0, IPPROTO_GRE,
@@ -434,6 +435,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, 
	struct pppox_sock *po = pppox_sk(sk);

	struct pptp_opt *opt = &po->proto.pptp;

	struct rtable *rt;

	struct flowi4 fl4;

	int error = 0;



	if (sp->sa_protocol != PX_PROTO_PPTP)
@@ -463,7 +465,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, 
	po->chan.private = sk;

	po->chan.ops = &pptp_chan_ops;



	rt = ip_route_output_ports(&init_net, sk,

	rt = ip_route_output_ports(&init_net, &fl4, sk,

				   opt->dst_addr.sin_addr.s_addr,

				   opt->src_addr.sin_addr.s_addr,

				   0, 0,

drivers/scsi/cxgbi/libcxgbi.c

+2 −1
Original line number Diff line number Diff line
@@ -454,8 +454,9 @@ static struct rtable *find_route_ipv4(__be32 saddr, __be32 daddr, 
				      __be16 sport, __be16 dport, u8 tos)

{

	struct rtable *rt;

	struct flowi4 fl4;



	rt = ip_route_output_ports(&init_net, NULL, daddr, saddr,

	rt = ip_route_output_ports(&init_net, &fl4, NULL, daddr, saddr,

				   dport, sport, IPPROTO_TCP, tos, 0);

	if (IS_ERR(rt))

		return NULL;

include/net/route.h

+5 −6
Original line number Diff line number Diff line
@@ -137,20 +137,19 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr, 
	return ip_route_output_key(net, &fl4);

}



static inline struct rtable *ip_route_output_ports(struct net *net, struct sock *sk,

static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi4 *fl4,

						   struct sock *sk,

						   __be32 daddr, __be32 saddr,

						   __be16 dport, __be16 sport,

						   __u8 proto, __u8 tos, int oif)

{

	struct flowi4 fl4;



	flowi4_init_output(&fl4, oif, sk ? sk->sk_mark : 0, tos,

	flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos,

			   RT_SCOPE_UNIVERSE, proto,

			   sk ? inet_sk_flowi_flags(sk) : 0,

			   daddr, saddr, dport, sport);

	if (sk)

		security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));

	return ip_route_output_flow(net, &fl4, sk);

		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));

	return ip_route_output_flow(net, fl4, sk);

}



static inline struct rtable *ip_route_output_gre(struct net *net,