ipv6: Convert to use flowi6 where applicable.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index e1767aec3334..6a137355311c 100644
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -208,14 +208,15 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,
 {
         struct net *net = xs_net(x);
         struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb;
+        const struct flowi6 *fl6 = &fl->u.ip6;
         struct ipv6_destopt_hao *hao = NULL;
         struct xfrm_selector sel;
         int offset;
         struct timeval stamp;
         int err = 0;
 
-        if (unlikely(fl->flowi_proto == IPPROTO_MH &&
-                     fl->fl6_mh_type <= IP6_MH_TYPE_MAX))
+        if (unlikely(fl6->flowi6_proto == IPPROTO_MH &&
+                     fl6->uli.mht.type <= IP6_MH_TYPE_MAX))
                 goto out;
 
         if (likely(opt->dsthao)) {
@@ -240,14 +241,14 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,
                sizeof(sel.saddr));
         sel.prefixlen_s = 128;
         sel.family = AF_INET6;
-        sel.proto = fl->flowi_proto;
-        sel.dport = xfrm_flowi_dport(fl, &fl->u.ip6.uli);
+        sel.proto = fl6->flowi6_proto;
+        sel.dport = xfrm_flowi_dport(fl, &fl6->uli);
         if (sel.dport)
                 sel.dport_mask = htons(~0);
-        sel.sport = xfrm_flowi_sport(fl, &fl->u.ip6.uli);
+        sel.sport = xfrm_flowi_sport(fl, &fl6->uli);
         if (sel.sport)
                 sel.sport_mask = htons(~0);
-        sel.ifindex = fl->flowi_oif;
+        sel.ifindex = fl6->flowi6_oif;
 
         err = km_report(net, IPPROTO_DSTOPTS, &sel,
                         (hao ? (xfrm_address_t *)&hao->addr : NULL));