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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 04ae676d14e..16560336eb7 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -151,8 +151,8 @@ ipv4_connected:
         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;
+        fl6.fl6_dport = inet->inet_dport;
+        fl6.fl6_sport = inet->inet_sport;
 
         if (!fl6.flowi6_oif && (addr_type&IPV6_ADDR_MULTICAST))
                 fl6.flowi6_oif = np->mcast_oif;
@@ -261,7 +261,7 @@ void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info)
         serr->ee.ee_info = info;
         serr->ee.ee_data = 0;
         serr->addr_offset = (u8 *)&iph->daddr - skb_network_header(skb);
-        serr->port = fl6->uli.ports.dport;
+        serr->port = fl6->fl6_dport;
 
         __skb_pull(skb, skb_tail_pointer(skb) - skb->data);
         skb_reset_transport_header(skb);