net: Put fl6_* macros to struct flowi6 and use them again.

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

1 files changed, 10 insertions, 10 deletions

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 8d26c122de64..de1b7e37ad5b 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -158,8 +158,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                         ipv6_addr_copy(&fl6.daddr, &np->daddr);
                         ipv6_addr_copy(&fl6.saddr, &np->saddr);
                         fl6.flowi6_oif = sk->sk_bound_dev_if;
-                        fl6.uli.ports.dport = inet->inet_dport;
-                        fl6.uli.ports.sport = inet->inet_sport;
+                        fl6.fl6_dport = inet->inet_dport;
+                        fl6.fl6_sport = inet->inet_sport;
                         security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
                         dst = ip6_dst_lookup_flow(sk, &fl6, NULL, false);
@@ -253,8 +253,8 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
         ipv6_addr_copy(&fl6.saddr, &ireq6->loc_addr);
         fl6.flowlabel = 0;
         fl6.flowi6_oif = ireq6->iif;
-        fl6.uli.ports.dport = inet_rsk(req)->rmt_port;
-        fl6.uli.ports.sport = inet_rsk(req)->loc_port;
+        fl6.fl6_dport = inet_rsk(req)->rmt_port;
+        fl6.fl6_sport = inet_rsk(req)->loc_port;
         security_req_classify_flow(req, flowi6_to_flowi(&fl6));
 
         opt = np->opt;
@@ -323,8 +323,8 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
 
         fl6.flowi6_proto = IPPROTO_DCCP;
         fl6.flowi6_oif = inet6_iif(rxskb);
-        fl6.uli.ports.dport = dccp_hdr(skb)->dccph_dport;
-        fl6.uli.ports.sport = dccp_hdr(skb)->dccph_sport;
+        fl6.fl6_dport = dccp_hdr(skb)->dccph_dport;
+        fl6.fl6_sport = dccp_hdr(skb)->dccph_sport;
         security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6));
 
         /* sk = NULL, but it is safe for now. RST socket required. */
@@ -535,8 +535,8 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
                 final_p = fl6_update_dst(&fl6, opt, &final);
                 ipv6_addr_copy(&fl6.saddr, &ireq6->loc_addr);
                 fl6.flowi6_oif = sk->sk_bound_dev_if;
-                fl6.uli.ports.dport = inet_rsk(req)->rmt_port;
-                fl6.uli.ports.sport = inet_rsk(req)->loc_port;
+                fl6.fl6_dport = inet_rsk(req)->rmt_port;
+                fl6.fl6_sport = inet_rsk(req)->loc_port;
                 security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
                 dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
@@ -957,8 +957,8 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         ipv6_addr_copy(&fl6.daddr, &np->daddr);
         ipv6_addr_copy(&fl6.saddr, saddr ? saddr : &np->saddr);
         fl6.flowi6_oif = sk->sk_bound_dev_if;
-        fl6.uli.ports.dport = usin->sin6_port;
-        fl6.uli.ports.sport = inet->inet_sport;
+        fl6.fl6_dport = usin->sin6_port;
+        fl6.fl6_sport = inet->inet_sport;
         security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
         final_p = fl6_update_dst(&fl6, np->opt, &final);