diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-31 04:54:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-31 04:54:27 -0700 |
| commit | c0951cbcfd7142003bc683046ef78a53c66d3265 (patch) | |
| tree | 703627b0f62db39c16721bfd3e3071e56a91aa62 | |
| parent | 1bba6ffeeb44480ddbdda912cc85ad2cfd4725ae (diff) | |
ipv4: Use flowi4_init_output() in udp_sendmsg()
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/udp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 588f47af5fa..ac66132b8ed 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -909,20 +909,14 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, rt = (struct rtable *)sk_dst_check(sk, 0); if (rt == NULL) { - struct flowi4 fl4 = { - .flowi4_oif = ipc.oif, - .flowi4_mark = sk->sk_mark, - .daddr = faddr, - .saddr = saddr, - .flowi4_tos = tos, - .flowi4_proto = sk->sk_protocol, - .flowi4_flags = (inet_sk_flowi_flags(sk) | - FLOWI_FLAG_CAN_SLEEP), - .fl4_sport = inet->inet_sport, - .fl4_dport = dport, - }; + struct flowi4 fl4; struct net *net = sock_net(sk); + flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos, + RT_SCOPE_UNIVERSE, sk->sk_protocol, + inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP, + faddr, saddr, dport, inet->inet_sport); + security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); rt = ip_route_output_flow(net, &fl4, sk); if (IS_ERR(rt)) { |