diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-03 20:25:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-03 20:25:42 -0700 |
| commit | 31e4543db29fb85496a122b965d6482c8d1a2bfe (patch) | |
| tree | 3e49d61a1202e1b3c8c71e422f3fd8e4f2616d01 /net/l2tp/l2tp_ip.c | |
| parent | f1390160ddcd64a3cfd48b3280d0a616a31b9520 (diff) | |
| download | linux-3.10-31e4543db29fb85496a122b965d6482c8d1a2bfe.tar.gz linux-3.10-31e4543db29fb85496a122b965d6482c8d1a2bfe.tar.bz2 linux-3.10-31e4543db29fb85496a122b965d6482c8d1a2bfe.zip | |
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 a4d2dfa1fdb..81899600abe 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 if (rt == NULL) { struct ip_options_rcu *inet_opt; + struct flowi4 fl4; rcu_read_lock(); 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 * keep trying until route appears or the connection times * itself out. */ - rt = ip_route_output_ports(sock_net(sk), sk, + rt = ip_route_output_ports(sock_net(sk), &fl4, sk, daddr, inet->inet_saddr, inet->inet_dport, inet->inet_sport, sk->sk_protocol, RT_CONN_FLAGS(sk), |