diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-03 23:25:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-03 23:25:42 -0400 |
commit | 31e4543db29fb85496a122b965d6482c8d1a2bfe (patch) | |
tree | 3e49d61a1202e1b3c8c71e422f3fd8e4f2616d01 /net/l2tp/l2tp_ip.c | |
parent | f1390160ddcd64a3cfd48b3280d0a616a31b9520 (diff) |
ipv4: Make caller provide on-stack flow key to ip_route_output_ports().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_ip.c')
-rw-r--r-- | net/l2tp/l2tp_ip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index a4d2dfa1fdbf..81899600abe2 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
@@ -471,6 +471,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m | |||
471 | 471 | ||
472 | if (rt == NULL) { | 472 | if (rt == NULL) { |
473 | struct ip_options_rcu *inet_opt; | 473 | struct ip_options_rcu *inet_opt; |
474 | struct flowi4 fl4; | ||
474 | 475 | ||
475 | rcu_read_lock(); | 476 | rcu_read_lock(); |
476 | inet_opt = rcu_dereference(inet->inet_opt); | 477 | inet_opt = rcu_dereference(inet->inet_opt); |
@@ -485,7 +486,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m | |||
485 | * keep trying until route appears or the connection times | 486 | * keep trying until route appears or the connection times |
486 | * itself out. | 487 | * itself out. |
487 | */ | 488 | */ |
488 | rt = ip_route_output_ports(sock_net(sk), sk, | 489 | rt = ip_route_output_ports(sock_net(sk), &fl4, sk, |
489 | daddr, inet->inet_saddr, | 490 | daddr, inet->inet_saddr, |
490 | inet->inet_dport, inet->inet_sport, | 491 | inet->inet_dport, inet->inet_sport, |
491 | sk->sk_protocol, RT_CONN_FLAGS(sk), | 492 | sk->sk_protocol, RT_CONN_FLAGS(sk), |