net: Break struct flowi out into AF specific instances.

Now we have struct flowi4, flowi6, and flowidn for each address
family.  And struct flowi is just a union of them all.

It might have been troublesome to convert flow_cache_uli_match() but
as it turns out this function is completely unused and therefore can
be simply removed.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index 5038e6b2b55b..e1767aec3334 100644
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -241,10 +241,10 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,
         sel.prefixlen_s = 128;
         sel.family = AF_INET6;
         sel.proto = fl->flowi_proto;
-        sel.dport = xfrm_flowi_dport(fl, &fl->uli_u);
+        sel.dport = xfrm_flowi_dport(fl, &fl->u.ip6.uli);
         if (sel.dport)
                 sel.dport_mask = htons(~0);
-        sel.sport = xfrm_flowi_sport(fl, &fl->uli_u);
+        sel.sport = xfrm_flowi_sport(fl, &fl->u.ip6.uli);
         if (sel.sport)
                 sel.sport_mask = htons(~0);
         sel.ifindex = fl->flowi_oif;
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 71277ce78590..b456533a652d 100644
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -26,9 +26,9 @@ __xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)
          * to current session. */
         ipv6_addr_copy((struct in6_addr *)&sel->daddr, &fl->fl6_dst);
         ipv6_addr_copy((struct in6_addr *)&sel->saddr, &fl->fl6_src);
-        sel->dport = xfrm_flowi_dport(fl, &fl->uli_u);
+        sel->dport = xfrm_flowi_dport(fl, &fl->u.ip6.uli);
         sel->dport_mask = htons(0xffff);
-        sel->sport = xfrm_flowi_sport(fl, &fl->uli_u);
+        sel->sport = xfrm_flowi_sport(fl, &fl->u.ip6.uli);
         sel->sport_mask = htons(0xffff);
         sel->family = AF_INET6;
         sel->prefixlen_d = 128;