ipv6: Convert to use flowi6 where applicable.

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

1 files changed, 57 insertions, 57 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index c531ad5fbccc..7ed0ba1995f0 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -131,7 +131,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         struct tcp_sock *tp = tcp_sk(sk);
         struct in6_addr *saddr = NULL, *final_p, final;
         struct rt6_info *rt;
-        struct flowi fl;
+        struct flowi6 fl6;
         struct dst_entry *dst;
         int addr_type;
         int err;
@@ -142,14 +142,14 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         if (usin->sin6_family != AF_INET6)
                 return -EAFNOSUPPORT;
 
-        memset(&fl, 0, sizeof(fl));
+        memset(&fl6, 0, sizeof(fl6));
 
         if (np->sndflow) {
-                fl.fl6_flowlabel = usin->sin6_flowinfo&IPV6_FLOWINFO_MASK;
-                IP6_ECN_flow_init(fl.fl6_flowlabel);
-                if (fl.fl6_flowlabel&IPV6_FLOWLABEL_MASK) {
+                fl6.flowlabel = usin->sin6_flowinfo&IPV6_FLOWINFO_MASK;
+                IP6_ECN_flow_init(fl6.flowlabel);
+                if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) {
                         struct ip6_flowlabel *flowlabel;
-                        flowlabel = fl6_sock_lookup(sk, fl.fl6_flowlabel);
+                        flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
                         if (flowlabel == NULL)
                                 return -EINVAL;
                         ipv6_addr_copy(&usin->sin6_addr, &flowlabel->dst);
@@ -195,7 +195,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         }
 
         ipv6_addr_copy(&np->daddr, &usin->sin6_addr);
-        np->flow_label = fl.fl6_flowlabel;
+        np->flow_label = fl6.flowlabel;
 
         /*
          *      TCP over IPv4
@@ -242,27 +242,27 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         if (!ipv6_addr_any(&np->rcv_saddr))
                 saddr = &np->rcv_saddr;
 
-        fl.flowi_proto = IPPROTO_TCP;
-        ipv6_addr_copy(&fl.fl6_dst, &np->daddr);
-        ipv6_addr_copy(&fl.fl6_src,
+        fl6.flowi6_proto = IPPROTO_TCP;
+        ipv6_addr_copy(&fl6.daddr, &np->daddr);
+        ipv6_addr_copy(&fl6.saddr,
                        (saddr ? saddr : &np->saddr));
-        fl.flowi_oif = sk->sk_bound_dev_if;
-        fl.flowi_mark = sk->sk_mark;
-        fl.fl6_dport = usin->sin6_port;
-        fl.fl6_sport = inet->inet_sport;
+        fl6.flowi6_oif = sk->sk_bound_dev_if;
+        fl6.flowi6_mark = sk->sk_mark;
+        fl6.uli.ports.dport = usin->sin6_port;
+        fl6.uli.ports.sport = inet->inet_sport;
 
-        final_p = fl6_update_dst(&fl, np->opt, &final);
+        final_p = fl6_update_dst(&fl6, np->opt, &final);
 
-        security_sk_classify_flow(sk, &fl);
+        security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
-        dst = ip6_dst_lookup_flow(sk, &fl, final_p, true);
+        dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
         if (IS_ERR(dst)) {
                 err = PTR_ERR(dst);
                 goto failure;
         }
 
         if (saddr == NULL) {
-                saddr = &fl.fl6_src;
+                saddr = &fl6.saddr;
                 ipv6_addr_copy(&np->rcv_saddr, saddr);
         }
 
@@ -389,23 +389,23 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
                 if (dst == NULL) {
                         struct inet_sock *inet = inet_sk(sk);
-                        struct flowi fl;
+                        struct flowi6 fl6;
 
                         /* BUGGG_FUTURE: Again, it is not clear how
                            to handle rthdr case. Ignore this complexity
                            for now.
                          */
-                        memset(&fl, 0, sizeof(fl));
-                        fl.flowi_proto = IPPROTO_TCP;
-                        ipv6_addr_copy(&fl.fl6_dst, &np->daddr);
-                        ipv6_addr_copy(&fl.fl6_src, &np->saddr);
-                        fl.flowi_oif = sk->sk_bound_dev_if;
-                        fl.flowi_mark = sk->sk_mark;
-                        fl.fl6_dport = inet->inet_dport;
-                        fl.fl6_sport = inet->inet_sport;
-                        security_skb_classify_flow(skb, &fl);
-
-                        dst = ip6_dst_lookup_flow(sk, &fl, NULL, false);
+                        memset(&fl6, 0, sizeof(fl6));
+                        fl6.flowi6_proto = IPPROTO_TCP;
+                        ipv6_addr_copy(&fl6.daddr, &np->daddr);
+                        ipv6_addr_copy(&fl6.saddr, &np->saddr);
+                        fl6.flowi6_oif = sk->sk_bound_dev_if;
+                        fl6.flowi6_mark = sk->sk_mark;
+                        fl6.uli.ports.dport = inet->inet_dport;
+                        fl6.uli.ports.sport = inet->inet_sport;
+                        security_skb_classify_flow(skb, flowi6_to_flowi(&fl6));
+
+                        dst = ip6_dst_lookup_flow(sk, &fl6, NULL, false);
                         if (IS_ERR(dst)) {
                                 sk->sk_err_soft = -PTR_ERR(dst);
                                 goto out;
@@ -482,25 +482,25 @@ static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req,
         struct sk_buff * skb;
         struct ipv6_txoptions *opt = NULL;
         struct in6_addr * final_p, final;
-        struct flowi fl;
+        struct flowi6 fl6;
         struct dst_entry *dst;
         int err;
 
-        memset(&fl, 0, sizeof(fl));
-        fl.flowi_proto = IPPROTO_TCP;
-        ipv6_addr_copy(&fl.fl6_dst, &treq->rmt_addr);
-        ipv6_addr_copy(&fl.fl6_src, &treq->loc_addr);
-        fl.fl6_flowlabel = 0;
-        fl.flowi_oif = treq->iif;
-        fl.flowi_mark = sk->sk_mark;
-        fl.fl6_dport = inet_rsk(req)->rmt_port;
-        fl.fl6_sport = inet_rsk(req)->loc_port;
-        security_req_classify_flow(req, &fl);
+        memset(&fl6, 0, sizeof(fl6));
+        fl6.flowi6_proto = IPPROTO_TCP;
+        ipv6_addr_copy(&fl6.daddr, &treq->rmt_addr);
+        ipv6_addr_copy(&fl6.saddr, &treq->loc_addr);
+        fl6.flowlabel = 0;
+        fl6.flowi6_oif = treq->iif;
+        fl6.flowi6_mark = sk->sk_mark;
+        fl6.uli.ports.dport = inet_rsk(req)->rmt_port;
+        fl6.uli.ports.sport = inet_rsk(req)->loc_port;
+        security_req_classify_flow(req, flowi6_to_flowi(&fl6));
 
         opt = np->opt;
-        final_p = fl6_update_dst(&fl, opt, &final);
+        final_p = fl6_update_dst(&fl6, opt, &final);
 
-        dst = ip6_dst_lookup_flow(sk, &fl, final_p, false);
+        dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
         if (IS_ERR(dst)) {
                 err = PTR_ERR(dst);
                 goto done;
@@ -510,8 +510,8 @@ static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req,
         if (skb) {
                 __tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr);
 
-                ipv6_addr_copy(&fl.fl6_dst, &treq->rmt_addr);
-                err = ip6_xmit(sk, skb, &fl, opt);
+                ipv6_addr_copy(&fl6.daddr, &treq->rmt_addr);
+                err = ip6_xmit(sk, skb, &fl6, opt);
                 err = net_xmit_eval(err);
         }
 
@@ -992,7 +992,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
 {
         struct tcphdr *th = tcp_hdr(skb), *t1;
         struct sk_buff *buff;
-        struct flowi fl;
+        struct flowi6 fl6;
         struct net *net = dev_net(skb_dst(skb)->dev);
         struct sock *ctl_sk = net->ipv6.tcp_sk;
         unsigned int tot_len = sizeof(struct tcphdr);
@@ -1046,29 +1046,29 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
         }
 #endif
 
-        memset(&fl, 0, sizeof(fl));
-        ipv6_addr_copy(&fl.fl6_dst, &ipv6_hdr(skb)->saddr);
-        ipv6_addr_copy(&fl.fl6_src, &ipv6_hdr(skb)->daddr);
+        memset(&fl6, 0, sizeof(fl6));
+        ipv6_addr_copy(&fl6.daddr, &ipv6_hdr(skb)->saddr);
+        ipv6_addr_copy(&fl6.saddr, &ipv6_hdr(skb)->daddr);
 
         buff->ip_summed = CHECKSUM_PARTIAL;
         buff->csum = 0;
 
-        __tcp_v6_send_check(buff, &fl.fl6_src, &fl.fl6_dst);
+        __tcp_v6_send_check(buff, &fl6.saddr, &fl6.daddr);
 
-        fl.flowi_proto = IPPROTO_TCP;
-        fl.flowi_oif = inet6_iif(skb);
-        fl.fl6_dport = t1->dest;
-        fl.fl6_sport = t1->source;
-        security_skb_classify_flow(skb, &fl);
+        fl6.flowi6_proto = IPPROTO_TCP;
+        fl6.flowi6_oif = inet6_iif(skb);
+        fl6.uli.ports.dport = t1->dest;
+        fl6.uli.ports.sport = t1->source;
+        security_skb_classify_flow(skb, flowi6_to_flowi(&fl6));
 
         /* Pass a socket to ip6_dst_lookup either it is for RST
          * Underlying function will use this to retrieve the network
          * namespace
          */
-        dst = ip6_dst_lookup_flow(ctl_sk, &fl, NULL, false);
+        dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL, false);
         if (!IS_ERR(dst)) {
                 skb_dst_set(buff, dst);
-                ip6_xmit(ctl_sk, buff, &fl, NULL);
+                ip6_xmit(ctl_sk, buff, &fl6, NULL);
                 TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
                 if (rst)
                         TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS);