diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-11-12 18:43:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-17 12:27:45 -0800 |
| commit | 5811662b15db018c740c57d037523683fd3e6123 (patch) | |
| tree | f820610a6024799a26699f22dc9a4ef5dee07978 /net/l2tp | |
| parent | dd68ad2235b4625e0dc928b2b4c614d265f976d3 (diff) | |
| download | lwn-5811662b15db018c740c57d037523683fd3e6123.tar.gz lwn-5811662b15db018c740c57d037523683fd3e6123.zip | |
net: use the macros defined for the members of flowi
Use the macros defined for the members of flowi to clean the code up.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 0bf6a59545ab..04635e88e8ed 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -476,15 +476,13 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m { struct flowi fl = { .oif = sk->sk_bound_dev_if, - .nl_u = { .ip4_u = { - .daddr = daddr, - .saddr = inet->inet_saddr, - .tos = RT_CONN_FLAGS(sk) } }, + .fl4_dst = daddr, + .fl4_src = inet->inet_saddr, + .fl4_tos = RT_CONN_FLAGS(sk), .proto = sk->sk_protocol, .flags = inet_sk_flowi_flags(sk), - .uli_u = { .ports = { - .sport = inet->inet_sport, - .dport = inet->inet_dport } } }; + .fl_ip_sport = inet->inet_sport, + .fl_ip_dport = inet->inet_dport }; /* If this fails, retransmit mechanism of transport layer will * keep trying until route appears or the connection times |