Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / net / ipv4 / xfrm4_policy.c

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 4a8c5335770c1e207677aeef423b9a70e2912d4a..b057d40addec3ef2ffab44413421e502894fe60e 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -23,12 +23,8 @@ static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos,
                                          xfrm_address_t *daddr)
 {
        struct flowi fl = {
-               .nl_u = {
-                       .ip4_u = {
-                               .tos = tos,
-                               .daddr = daddr->a4,
-                       },
-               },
+               .fl4_dst = daddr->a4,
+               .fl4_tos = tos,
        };
        struct dst_entry *dst;
        struct rtable *rt;