diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 16:22:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:54 -0500 |
commit | 4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c (patch) | |
tree | c29c8070012cffb38fe249cf528589a675f622b1 /net/ipv6/syncookies.c | |
parent | 9cce96df5b76691712dba22e83ff5efe900361e1 (diff) |
ipv6: Convert to use flowi6 where applicable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/syncookies.c')
-rw-r--r-- | net/ipv6/syncookies.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 5b9eded1432c..97858d5d67e8 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c | |||
@@ -232,19 +232,19 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) | |||
232 | */ | 232 | */ |
233 | { | 233 | { |
234 | struct in6_addr *final_p, final; | 234 | struct in6_addr *final_p, final; |
235 | struct flowi fl; | 235 | struct flowi6 fl6; |
236 | memset(&fl, 0, sizeof(fl)); | 236 | memset(&fl6, 0, sizeof(fl6)); |
237 | fl.flowi_proto = IPPROTO_TCP; | 237 | fl6.flowi6_proto = IPPROTO_TCP; |
238 | ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr); | 238 | ipv6_addr_copy(&fl6.daddr, &ireq6->rmt_addr); |
239 | final_p = fl6_update_dst(&fl, np->opt, &final); | 239 | final_p = fl6_update_dst(&fl6, np->opt, &final); |
240 | ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr); | 240 | ipv6_addr_copy(&fl6.saddr, &ireq6->loc_addr); |
241 | fl.flowi_oif = sk->sk_bound_dev_if; | 241 | fl6.flowi6_oif = sk->sk_bound_dev_if; |
242 | fl.flowi_mark = sk->sk_mark; | 242 | fl6.flowi6_mark = sk->sk_mark; |
243 | fl.fl6_dport = inet_rsk(req)->rmt_port; | 243 | fl6.uli.ports.dport = inet_rsk(req)->rmt_port; |
244 | fl.fl6_sport = inet_sk(sk)->inet_sport; | 244 | fl6.uli.ports.sport = inet_sk(sk)->inet_sport; |
245 | security_req_classify_flow(req, &fl); | 245 | security_req_classify_flow(req, flowi6_to_flowi(&fl6)); |
246 | 246 | ||
247 | dst = ip6_dst_lookup_flow(sk, &fl, final_p, false); | 247 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false); |
248 | if (IS_ERR(dst)) | 248 | if (IS_ERR(dst)) |
249 | goto out_free; | 249 | goto out_free; |
250 | } | 250 | } |