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, 5 insertions, 5 deletions

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 9e123e08b9b7..52ff7aa1f9fc 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -448,8 +448,8 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
         if (saddr)
                 ipv6_addr_copy(&fl.fl6_src, saddr);
         fl.flowi_oif = iif;
-        fl.fl_icmp_type = type;
-        fl.fl_icmp_code = code;
+        fl.fl6_icmp_type = type;
+        fl.fl6_icmp_code = code;
         security_skb_classify_flow(skb, &fl);
 
         sk = icmpv6_xmit_lock(net);
@@ -544,7 +544,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
         if (saddr)
                 ipv6_addr_copy(&fl.fl6_src, saddr);
         fl.flowi_oif = skb->dev->ifindex;
-        fl.fl_icmp_type = ICMPV6_ECHO_REPLY;
+        fl.fl6_icmp_type = ICMPV6_ECHO_REPLY;
         security_skb_classify_flow(skb, &fl);
 
         sk = icmpv6_xmit_lock(net);
@@ -794,8 +794,8 @@ void icmpv6_flow_init(struct sock *sk, struct flowi *fl,
         ipv6_addr_copy(&fl->fl6_src, saddr);
         ipv6_addr_copy(&fl->fl6_dst, daddr);
         fl->flowi_proto         = IPPROTO_ICMPV6;
-        fl->fl_icmp_type        = type;
-        fl->fl_icmp_code        = 0;
+        fl->fl6_icmp_type       = type;
+        fl->fl6_icmp_code       = 0;
         fl->flowi_oif           = oif;
         security_sk_classify_flow(sk, fl);
 }