aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 00:29:39 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 18:08:44 -0500
commit1d28f42c1bd4bb2363d88df74d0128b4da135b4a (patch)
treecb2e652fe79a2bc307e871bc2d3fa51cc8051e45 /net/ipv4/udp.c
parentca116922afa8cc5ad46b00c0a637b1cde5ca478a (diff)
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/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index c9a73e5b26a3..e10f62e6c07c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -908,16 +908,17 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
908 rt = (struct rtable *)sk_dst_check(sk, 0); 908 rt = (struct rtable *)sk_dst_check(sk, 0);
909 909
910 if (rt == NULL) { 910 if (rt == NULL) {
911 struct flowi fl = { .oif = ipc.oif, 911 struct flowi fl = {
912 .mark = sk->sk_mark, 912 .flowi_oif = ipc.oif,
913 .fl4_dst = faddr, 913 .flowi_mark = sk->sk_mark,
914 .fl4_src = saddr, 914 .fl4_dst = faddr,
915 .fl4_tos = tos, 915 .fl4_src = saddr,
916 .proto = sk->sk_protocol, 916 .fl4_tos = tos,
917 .flags = (inet_sk_flowi_flags(sk) | 917 .flowi_proto = sk->sk_protocol,
918 FLOWI_FLAG_CAN_SLEEP), 918 .flowi_flags = (inet_sk_flowi_flags(sk) |
919 .fl_ip_sport = inet->inet_sport, 919 FLOWI_FLAG_CAN_SLEEP),
920 .fl_ip_dport = dport 920 .fl_ip_sport = inet->inet_sport,
921 .fl_ip_dport = dport,
921 }; 922 };
922 struct net *net = sock_net(sk); 923 struct net *net = sock_net(sk);
923 924