diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 00:00:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 15:08:42 -0800 |
| commit | 78fbfd8a653ca972afe479517a40661bfff6d8c3 (patch) | |
| tree | 9dccc5c16bf269d53d8499064ec95a998e84c646 /net/ipv4/af_inet.c | |
| parent | 1561747ddf9d28185548687b11aae7074d6129c4 (diff) | |
| download | kernel_samsung_smdk4412-78fbfd8a653ca972afe479517a40661bfff6d8c3.zip kernel_samsung_smdk4412-78fbfd8a653ca972afe479517a40661bfff6d8c3.tar.gz kernel_samsung_smdk4412-78fbfd8a653ca972afe479517a40661bfff6d8c3.tar.bz2 | |
ipv4: Create and use route lookup helpers.
The idea here is this minimizes the number of places one has to edit
in order to make changes to how flows are defined and used.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 35a5020..807d83c 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1157,22 +1157,10 @@ int inet_sk_rebuild_header(struct sock *sk) daddr = inet->inet_daddr; if (inet->opt && inet->opt->srr) daddr = inet->opt->faddr; - { - struct flowi fl = { - .oif = sk->sk_bound_dev_if, - .mark = sk->sk_mark, - .fl4_dst = daddr, - .fl4_src = inet->inet_saddr, - .fl4_tos = RT_CONN_FLAGS(sk), - .proto = sk->sk_protocol, - .flags = inet_sk_flowi_flags(sk), - .fl_ip_sport = inet->inet_sport, - .fl_ip_dport = inet->inet_dport, - }; - - security_sk_classify_flow(sk, &fl); - rt = ip_route_output_flow(sock_net(sk), &fl, sk); - } + rt = ip_route_output_ports(sock_net(sk), sk, daddr, inet->inet_saddr, + inet->inet_dport, inet->inet_sport, + sk->sk_protocol, RT_CONN_FLAGS(sk), + sk->sk_bound_dev_if); if (!IS_ERR(rt)) { err = 0; sk_setup_caps(sk, &rt->dst); |