ipv6: Convert to use flowi6 where applicable.

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / netfilter / ip6t_REJECT.c

diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index d1e905b7f563fd0dffb322d62e708a3453fb0bb3..df05511dea3324d5c123b0c8b9acd26dc33bbc9f 100644 (file)
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -47,7 +47,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
        struct ipv6hdr *ip6h;
        struct dst_entry *dst = NULL;
        u8 proto;
-       struct flowi fl;
+       struct flowi6 fl6;
 
        if ((!(ipv6_addr_type(&oip6h->saddr) & IPV6_ADDR_UNICAST)) ||
            (!(ipv6_addr_type(&oip6h->daddr) & IPV6_ADDR_UNICAST))) {
@@ -89,19 +89,19 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
                return;
        }
 
-       memset(&fl, 0, sizeof(fl));
-       fl.flowi_proto = IPPROTO_TCP;
-       ipv6_addr_copy(&fl.fl6_src, &oip6h->daddr);
-       ipv6_addr_copy(&fl.fl6_dst, &oip6h->saddr);
-       fl.fl6_sport = otcph.dest;
-       fl.fl6_dport = otcph.source;
-       security_skb_classify_flow(oldskb, &fl);
-       dst = ip6_route_output(net, NULL, &fl);
+       memset(&fl6, 0, sizeof(fl6));
+       fl6.flowi6_proto = IPPROTO_TCP;
+       ipv6_addr_copy(&fl6.saddr, &oip6h->daddr);
+       ipv6_addr_copy(&fl6.daddr, &oip6h->saddr);
+       fl6.uli.ports.sport = otcph.dest;
+       fl6.uli.ports.dport = otcph.source;
+       security_skb_classify_flow(oldskb, flowi6_to_flowi(&fl6));
+       dst = ip6_route_output(net, NULL, &fl6);
        if (dst == NULL || dst->error) {
                dst_release(dst);
                return;
        }
-       dst = xfrm_lookup(net, dst, &fl, NULL, 0);
+       dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
        if (IS_ERR(dst))
                return;