diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 00:29:39 -0500 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 15:08:44 -0800 | 
| commit | 1d28f42c1bd4bb2363d88df74d0128b4da135b4a (patch) | |
| tree | cb2e652fe79a2bc307e871bc2d3fa51cc8051e45 /net/ipv6/syncookies.c | |
| parent | ca116922afa8cc5ad46b00c0a637b1cde5ca478a (diff) | |
| download | olio-linux-3.10-1d28f42c1bd4bb2363d88df74d0128b4da135b4a.tar.xz olio-linux-3.10-1d28f42c1bd4bb2363d88df74d0128b4da135b4a.zip  | |
net: Put flowi_* prefix on AF independent members of struct flowi
I intend to turn struct flowi into a union of AF specific flowi
structs.  There will be a common structure that each variant includes
first, much like struct sock_common.
This is the first step to move in that direction.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/syncookies.c')
| -rw-r--r-- | net/ipv6/syncookies.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index 0b4cf350631..ca5255c0837 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c @@ -234,12 +234,12 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)  		struct in6_addr *final_p, final;  		struct flowi fl;  		memset(&fl, 0, sizeof(fl)); -		fl.proto = IPPROTO_TCP; +		fl.flowi_proto = IPPROTO_TCP;  		ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);  		final_p = fl6_update_dst(&fl, np->opt, &final);  		ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr); -		fl.oif = sk->sk_bound_dev_if; -		fl.mark = sk->sk_mark; +		fl.flowi_oif = sk->sk_bound_dev_if; +		fl.flowi_mark = sk->sk_mark;  		fl.fl_ip_dport = inet_rsk(req)->rmt_port;  		fl.fl_ip_sport = inet_sk(sk)->inet_sport;  		security_req_classify_flow(req, &fl);  |