net: Make flowi ports AF dependent.

Create two sets of port member accessors, one set prefixed by fl4_*
and the other prefixed by fl6_*

This will let us to create AF optimal flow instances.

It will work because every context in which we access the ports,
we have to be fully aware of which AF the flowi is anyways.

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 6c24b26f67e..07e03e68243 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -151,8 +151,8 @@ ipv4_connected:
         ipv6_addr_copy(&fl.fl6_src, &np->saddr);
         fl.flowi_oif = sk->sk_bound_dev_if;
         fl.flowi_mark = sk->sk_mark;
-        fl.fl_ip_dport = inet->inet_dport;
-        fl.fl_ip_sport = inet->inet_sport;
+        fl.fl6_dport = inet->inet_dport;
+        fl.fl6_sport = inet->inet_sport;
 
         if (!fl.flowi_oif && (addr_type&IPV6_ADDR_MULTICAST))
                 fl.flowi_oif = np->mcast_oif;
@@ -261,7 +261,7 @@ void ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info)
         serr->ee.ee_info = info;
         serr->ee.ee_data = 0;
         serr->addr_offset = (u8 *)&iph->daddr - skb_network_header(skb);
-        serr->port = fl->fl_ip_dport;
+        serr->port = fl->fl6_dport;
 
         __skb_pull(skb, skb_tail_pointer(skb) - skb->data);
         skb_reset_transport_header(skb);