[NET]: Actually apply Yoshfuji's fl6_{src,dst} patch.

diff --git a/include/net/flow.h b/include/net/flow.h
index 58fbf0e8314ae4d15443dbce13fa6ecb71ad46c8..5f5d8f323646a795c9889d548c1e796423e50b1e 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -50,6 +50,10 @@ struct flowi {
 
                __u32           spi;
        } uli_u;
+#define fl_ip_sport    uli_u.ports.sport
+#define fl_ip_dport    uli_u.ports.dport
+#define fl_icmp_type   uli_u.icmpt.type
+#define fl_icmp_code   uli_u.icmpt.code
+#define fl_ipsec_spi   uli_u.spi
 };
-
 #endif

diff --git a/include/net/route.h b/include/net/route.h
index ba15b51407987042dc345c9b46791bb1c9da9118..acdfaaf6afb95ebdf16740b793615f7902912525 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -173,13 +173,13 @@ static inline int ip_route_connect(struct rtable **rp, u32 dst,
 static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport,
                                    struct sock *sk)
 {
-       if (sport != (*rp)->fl.uli_u.ports.sport ||
-           dport != (*rp)->fl.uli_u.ports.dport) {
+       if (sport != (*rp)->fl.fl_ip_sport ||
+           dport != (*rp)->fl.fl_ip_dport) {
                struct flowi fl;
 
                memcpy(&fl, &(*rp)->fl, sizeof(fl));
-               fl.uli_u.ports.sport = sport;
-               fl.uli_u.ports.dport = dport;
+               fl.fl_ip_sport = sport;
+               fl.fl_ip_dport = dport;
                ip_rt_put(*rp);
                *rp = NULL;
                return ip_route_output_flow(rp, &fl, sk, 0);

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 6868d7a41bba6d625cf9dc2fc79a0d5530adc311..b3a67d100b4d0950194c462a055d77be07366656 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -295,11 +295,11 @@ extern int xfrm_unregister_km(struct xfrm_mgr *km);
 
 static inline u32 __flow_hash4(struct flowi *fl)
 {
-       u32 hash = fl->fl4_src ^ fl->uli_u.ports.sport;
+       u32 hash = fl->fl4_src ^ fl->fl_ip_sport;
 
        hash = ((hash & 0xF0F0F0F0) >> 4) | ((hash & 0x0F0F0F0F) << 4);
 
-       hash ^= fl->fl4_dst ^ fl->uli_u.ports.dport;
+       hash ^= fl->fl4_dst ^ fl->fl_ip_dport;
        hash ^= (hash >> 10);
        hash ^= (hash >> 20);
        return hash & (XFRM_FLOWCACHE_HASH_SIZE-1);
@@ -309,13 +309,13 @@ static inline u32 __flow_hash6(struct flowi *fl)
 {
        u32 hash = fl->fl6_src->s6_addr32[2] ^
                   fl->fl6_src->s6_addr32[3] ^ 
-                  fl->uli_u.ports.sport;
+                  fl->fl_ip_sport;
 
        hash = ((hash & 0xF0F0F0F0) >> 4) | ((hash & 0x0F0F0F0F) << 4);
 
        hash ^= fl->fl6_dst->s6_addr32[2] ^
                fl->fl6_dst->s6_addr32[3] ^ 
-               fl->uli_u.ports.dport;
+               fl->fl_ip_dport;
        hash ^= (hash >> 10);
        hash ^= (hash >> 20);
        return hash & (XFRM_FLOWCACHE_HASH_SIZE-1);
@@ -454,8 +454,8 @@ __xfrm4_selector_match(struct xfrm_selector *sel, struct flowi *fl)
 {
        return  addr_match(&fl->fl4_dst, &sel->daddr, sel->prefixlen_d) &&
                addr_match(&fl->fl4_src, &sel->saddr, sel->prefixlen_s) &&
-               !((fl->uli_u.ports.dport^sel->dport)&sel->dport_mask) &&
-               !((fl->uli_u.ports.sport^sel->sport)&sel->sport_mask) &&
+               !((fl->fl_ip_dport^sel->dport)&sel->dport_mask) &&
+               !((fl->fl_ip_sport^sel->sport)&sel->sport_mask) &&
                (fl->proto == sel->proto || !sel->proto) &&
                (fl->oif == sel->ifindex || !sel->ifindex);
 }
@@ -465,8 +465,8 @@ __xfrm6_selector_match(struct xfrm_selector *sel, struct flowi *fl)
 {
        return  addr_match(fl->fl6_dst, &sel->daddr, sel->prefixlen_d) &&
                addr_match(fl->fl6_src, &sel->saddr, sel->prefixlen_s) &&
-               !((fl->uli_u.ports.dport^sel->dport)&sel->dport_mask) &&
-               !((fl->uli_u.ports.sport^sel->sport)&sel->sport_mask) &&
+               !((fl->fl_ip_dport^sel->dport)&sel->dport_mask) &&
+               !((fl->fl_ip_sport^sel->sport)&sel->sport_mask) &&
                (fl->proto == sel->proto || !sel->proto) &&
                (fl->oif == sel->ifindex || !sel->ifindex);
 }

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index f98136d5ba5801659cd1994de49b324b23b1706e..2135ee473a2d68af75decd59732300d07ce74029 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -180,8 +180,8 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
                        if (pskb_may_pull(skb, xprth + 4 - skb->data)) {
                                u16 *ports = (u16 *)xprth;
 
-                               fl->uli_u.ports.sport = ports[0];
-                               fl->uli_u.ports.dport = ports[1];
+                               fl->fl_ip_sport = ports[0];
+                               fl->fl_ip_dport = ports[1];
                        }
                        break;
 
@@ -189,7 +189,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
                        if (pskb_may_pull(skb, xprth + 4 - skb->data)) {
                                u32 *ehdr = (u32 *)xprth;
 
-                               fl->uli_u.spi = ehdr[0];
+                               fl->fl_ipsec_spi = ehdr[0];
                        }
                        break;
 
@@ -197,7 +197,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
                        if (pskb_may_pull(skb, xprth + 8 - skb->data)) {
                                u32 *ah_hdr = (u32*)xprth;
 
-                               fl->uli_u.spi = ah_hdr[1];
+                               fl->fl_ipsec_spi = ah_hdr[1];
                        }
                        break;
 
@@ -205,11 +205,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
                        if (pskb_may_pull(skb, xprth + 4 - skb->data)) {
                                u16 *ipcomp_hdr = (u16 *)xprth;
 
-                               fl->uli_u.spi = ntohl(ntohs(ipcomp_hdr[1]));
+                               fl->fl_ipsec_spi = ntohl(ntohs(ipcomp_hdr[1]));
                        }
                        break;
                default:
-                       fl->uli_u.spi = 0;
+                       fl->fl_ipsec_spi = 0;
                        break;
                };
        } else {

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 77be6d24917ef4ce3b69b8367b53263262a52e24..453e07def78e6c472894957396bc4fc0af430c08 100644 (file)
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -20,9 +20,9 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl,
 {
        x->sel.daddr.a4 = fl->fl4_dst;
        x->sel.saddr.a4 = fl->fl4_src;
-       x->sel.dport = fl->uli_u.ports.dport;
+       x->sel.dport = fl->fl_ip_dport;
        x->sel.dport_mask = ~0;
-       x->sel.sport = fl->uli_u.ports.sport;
+       x->sel.sport = fl->fl_ip_sport;
        x->sel.sport_mask = ~0;
        x->sel.prefixlen_d = 32;
        x->sel.prefixlen_s = 32;

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 1ba8c5457b10fef8a5177ccd7e218c544e7794d4..77c5709a355d6b277f9e2063e773597d94988a40 100644 (file)
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -91,7 +91,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->nh.raw;
-       serr->port = fl->uli_u.ports.dport;
+       serr->port = fl->fl_ip_dport;
 
        skb->h.raw = skb->tail;
        __skb_pull(skb, skb->tail - skb->data);

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 961560fe28d42306c387c756d1cff0b40d374d14..f964c49da2466ff50a565423f46f01137991e670 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -313,12 +313,12 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
        }
 
        fl.proto = IPPROTO_ICMPV6;
-       fl.nl_u.ip6_u.daddr = &hdr->saddr;
-       fl.nl_u.ip6_u.saddr = saddr;
+       fl.fl6_dst = &hdr->saddr;
+       fl.fl6_src = saddr;
        fl.oif = iif;
        fl.fl6_flowlabel = 0;
-       fl.uli_u.icmpt.type = type;
-       fl.uli_u.icmpt.code = code;
+       fl.fl_icmp_type = type;
+       fl.fl_icmp_code = code;
 
        icmpv6_xmit_lock();
 
@@ -387,12 +387,12 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
        msg.daddr =  &skb->nh.ipv6h->saddr;
 
        fl.proto = IPPROTO_ICMPV6;
-       fl.nl_u.ip6_u.daddr = msg.daddr;
-       fl.nl_u.ip6_u.saddr = saddr;
+       fl.fl6_dst = msg.daddr;
+       fl.fl6_src = saddr;
        fl.oif = skb->dev->ifindex;
        fl.fl6_flowlabel = 0;
-       fl.uli_u.icmpt.type = ICMPV6_ECHO_REPLY;
-       fl.uli_u.icmpt.code = 0;
+       fl.fl_icmp_type = ICMPV6_ECHO_REPLY;
+       fl.fl_icmp_code = 0;
 
        icmpv6_xmit_lock();
 

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index a3e58a770886a4aea34ab9796bead63dde1faab3..0f1e4810552d15a0d9df126adf181b1885d20a52 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -147,8 +147,8 @@ int ip6_route_me_harder(struct sk_buff *skb)
        fl.fl6_src = &iph->saddr;
        fl.oif = skb->sk ? skb->sk->bound_dev_if : 0;
        fl.fl6_flowlabel = 0;
-       fl.uli_u.ports.dport = 0;
-       fl.uli_u.ports.sport = 0;
+       fl.fl_ip_dport = 0;
+       fl.fl_ip_sport = 0;
 
        dst = ip6_route_output(skb->sk, &fl);
 
@@ -188,7 +188,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
             struct ipv6_txoptions *opt)
 {
        struct ipv6_pinfo *np = sk ? inet6_sk(sk) : NULL;
-       struct in6_addr *first_hop = fl->nl_u.ip6_u.daddr;
+       struct in6_addr *first_hop = fl->fl6_dst;
        struct dst_entry *dst = skb->dst;
        struct ipv6hdr *hdr;
        u8  proto = fl->proto;
@@ -243,7 +243,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
        hdr->nexthdr = proto;
        hdr->hop_limit = hlimit;
 
-       ipv6_addr_copy(&hdr->saddr, fl->nl_u.ip6_u.saddr);
+       ipv6_addr_copy(&hdr->saddr, fl->fl6_src);
        ipv6_addr_copy(&hdr->daddr, first_hop);
 
        mtu = dst_pmtu(dst);
@@ -308,8 +308,8 @@ static struct ipv6hdr * ip6_bld_1(struct sock *sk, struct sk_buff *skb, struct f
        hdr->hop_limit = hlimit;
        hdr->nexthdr = fl->proto;
 
-       ipv6_addr_copy(&hdr->saddr, fl->nl_u.ip6_u.saddr);
-       ipv6_addr_copy(&hdr->daddr, fl->nl_u.ip6_u.daddr);
+       ipv6_addr_copy(&hdr->saddr, fl->fl6_src);
+       ipv6_addr_copy(&hdr->daddr, fl->fl6_dst);
        return hdr;
 }
 
@@ -526,7 +526,7 @@ int ip6_build_xmit(struct sock *sk, inet_getfrag_t getfrag, const void *data,
                fl->fl6_dst = rt0->addr;
        }
 
-       if (!fl->oif && ipv6_addr_is_multicast(fl->nl_u.ip6_u.daddr))
+       if (!fl->oif && ipv6_addr_is_multicast(fl->fl6_dst))
                fl->oif = np->mcast_oif;
 
        dst = __sk_dst_check(sk, np->dst_cookie);
@@ -703,7 +703,7 @@ int ip6_build_xmit(struct sock *sk, inet_getfrag_t getfrag, const void *data,
         *      cleanup
         */
 out:
-       ip6_dst_store(sk, dst, fl->nl_u.ip6_u.daddr == &np->daddr ? &np->daddr : NULL);
+       ip6_dst_store(sk, dst, fl->fl6_dst == &np->daddr ? &np->daddr : NULL);
        if (err > 0)
                err = np->recverr ? net_xmit_errno(err) : 0;
        return err;

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index af8c2bc09534e4cdcf69592b1e7bb281e4305c3b..c5b38160717dd1764aa4f79ebb17e8c1871a7199 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -405,8 +405,8 @@ static inline void ndisc_flow_init(struct flowi *fl, u8 type,
        fl->fl6_src             = saddr;
        fl->fl6_dst             = daddr;
        fl->proto               = IPPROTO_ICMPV6;
-       fl->uli_u.icmpt.type    = type;
-       fl->uli_u.icmpt.code    = 0;
+       fl->fl_icmp_type        = type;
+       fl->fl_icmp_code        = 0;
 }
 
 static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index b211cacdfee5e49084358753f01a1254388414ee..70953d767456d69645067698bf54c4b4b3f0b58a 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -622,8 +622,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg
        fl.fl6_dst = daddr;
        if (fl.fl6_src == NULL && !ipv6_addr_any(&np->saddr))
                fl.fl6_src = &np->saddr;
-       fl.uli_u.icmpt.type = 0;
-       fl.uli_u.icmpt.code = 0;
+       fl.fl_icmp_type = 0;
+       fl.fl_icmp_code = 0;
        
        if (raw_opt->checksum) {
                struct rawv6_fakehdr hdr;

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fe43f3c037ea502a296d45d198baac6428b9eadb..c855580c278a22e0d596eda6b160cdcc67a44348 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -449,13 +449,12 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
        int strict;
        int attempts = 3;
 
-       strict = ipv6_addr_type(fl->nl_u.ip6_u.daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);
+       strict = ipv6_addr_type(fl->fl6_dst) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);
 
 relookup:
        read_lock_bh(&rt6_lock);
 
-       fn = fib6_lookup(&ip6_routing_table, fl->nl_u.ip6_u.daddr,
-                        fl->nl_u.ip6_u.saddr);
+       fn = fib6_lookup(&ip6_routing_table, fl->fl6_dst, fl->fl6_src);
 
 restart:
        rt = fn->leaf;
@@ -477,9 +476,8 @@ restart:
        if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
                read_unlock_bh(&rt6_lock);
 
-               rt = rt6_cow(rt, fl->nl_u.ip6_u.daddr,
-                            fl->nl_u.ip6_u.saddr);
-                       
+               rt = rt6_cow(rt, fl->fl6_dst, fl->fl6_src);
+
                if (rt->u.dst.error != -EEXIST || --attempts <= 0)
                        goto out2;
 
@@ -1585,15 +1583,11 @@ int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg)
        skb->mac.raw = skb->data;
        skb_reserve(skb, MAX_HEADER + sizeof(struct ipv6hdr));
 
-       fl.proto = 0;
-       fl.nl_u.ip6_u.daddr = NULL;
-       fl.nl_u.ip6_u.saddr = NULL;
-       fl.uli_u.icmpt.type = 0;
-       fl.uli_u.icmpt.code = 0;
+       memset(&fl, 0, sizeof(fl));
        if (rta[RTA_SRC-1])
-               fl.nl_u.ip6_u.saddr = (struct in6_addr*)RTA_DATA(rta[RTA_SRC-1]);
+               fl.fl6_src = (struct in6_addr*)RTA_DATA(rta[RTA_SRC-1]);
        if (rta[RTA_DST-1])
-               fl.nl_u.ip6_u.daddr = (struct in6_addr*)RTA_DATA(rta[RTA_DST-1]);
+               fl.fl6_dst = (struct in6_addr*)RTA_DATA(rta[RTA_DST-1]);
 
        if (rta[RTA_IIF-1])
                memcpy(&iif, RTA_DATA(rta[RTA_IIF-1]), sizeof(int));
@@ -1617,8 +1611,7 @@ int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg)
 
        NETLINK_CB(skb).dst_pid = NETLINK_CB(in_skb).pid;
        err = rt6_fill_node(skb, rt, 
-                           fl.nl_u.ip6_u.daddr,
-                           fl.nl_u.ip6_u.saddr,
+                           fl.fl6_dst, fl.fl6_src,
                            iif,
                            RTM_NEWROUTE, NETLINK_CB(in_skb).pid,
                            nlh->nlmsg_seq, nlh);

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0c389aa21831edb85dd2610d4dda99b99e60fcb3..5f324869dade055e7f19ac149eb5dab3fec944a1 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -670,12 +670,12 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
        fl.fl6_dst = &np->daddr;
        fl.fl6_src = saddr;
        fl.oif = sk->bound_dev_if;
-       fl.uli_u.ports.dport = usin->sin6_port;
-       fl.uli_u.ports.sport = inet->sport;
+       fl.fl_ip_dport = usin->sin6_port;
+       fl.fl_ip_sport = inet->sport;
 
        if (np->opt && np->opt->srcrt) {
                struct rt0_hdr *rt0 = (struct rt0_hdr *)np->opt->srcrt;
-               fl.nl_u.ip6_u.daddr = rt0->addr;
+               fl.fl6_dst = rt0->addr;
        }
 
        if (!fl.fl6_src)
@@ -796,11 +796,11 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                           for now.
                         */
                        fl.proto = IPPROTO_TCP;
-                       fl.nl_u.ip6_u.daddr = &np->daddr;
-                       fl.nl_u.ip6_u.saddr = &np->saddr;
+                       fl.fl6_dst = &np->daddr;
+                       fl.fl6_src = &np->saddr;
                        fl.oif = sk->bound_dev_if;
-                       fl.uli_u.ports.dport = inet->dport;
-                       fl.uli_u.ports.sport = inet->sport;
+                       fl.fl_ip_dport = inet->dport;
+                       fl.fl_ip_sport = inet->sport;
 
                        dst = ip6_route_output(sk, &fl);
                } else
@@ -881,12 +881,12 @@ static int tcp_v6_send_synack(struct sock *sk, struct open_request *req,
        int err = -1;
 
        fl.proto = IPPROTO_TCP;
-       fl.nl_u.ip6_u.daddr = &req->af.v6_req.rmt_addr;
-       fl.nl_u.ip6_u.saddr = &req->af.v6_req.loc_addr;
+       fl.fl6_dst = &req->af.v6_req.rmt_addr;
+       fl.fl6_src = &req->af.v6_req.loc_addr;
        fl.fl6_flowlabel = 0;
        fl.oif = req->af.v6_req.iif;
-       fl.uli_u.ports.dport = req->rmt_port;
-       fl.uli_u.ports.sport = inet_sk(sk)->sport;
+       fl.fl_ip_dport = req->rmt_port;
+       fl.fl_ip_sport = inet_sk(sk)->sport;
 
        if (dst == NULL) {
                opt = np->opt;
@@ -901,7 +901,7 @@ static int tcp_v6_send_synack(struct sock *sk, struct open_request *req,
 
                if (opt && opt->srcrt) {
                        struct rt0_hdr *rt0 = (struct rt0_hdr *) opt->srcrt;
-                       fl.nl_u.ip6_u.daddr = rt0->addr;
+                       fl.fl6_dst = rt0->addr;
                }
 
                dst = ip6_route_output(sk, &fl);
@@ -917,7 +917,7 @@ static int tcp_v6_send_synack(struct sock *sk, struct open_request *req,
                                         &req->af.v6_req.loc_addr, &req->af.v6_req.rmt_addr,
                                         csum_partial((char *)th, skb->len, skb->csum));
 
-               fl.nl_u.ip6_u.daddr = &req->af.v6_req.rmt_addr;
+               fl.fl6_dst = &req->af.v6_req.rmt_addr;
                err = ip6_xmit(sk, skb, &fl, opt);
                if (err == NET_XMIT_CN)
                        err = 0;
@@ -1019,19 +1019,18 @@ static void tcp_v6_send_reset(struct sk_buff *skb)
 
        buff->csum = csum_partial((char *)t1, sizeof(*t1), 0);
 
-       fl.nl_u.ip6_u.daddr = &skb->nh.ipv6h->saddr;
-       fl.nl_u.ip6_u.saddr = &skb->nh.ipv6h->daddr;
+       fl.fl6_dst = &skb->nh.ipv6h->saddr;
+       fl.fl6_src = &skb->nh.ipv6h->daddr;
        fl.fl6_flowlabel = 0;
 
-       t1->check = csum_ipv6_magic(fl.nl_u.ip6_u.saddr,
-                                   fl.nl_u.ip6_u.daddr, 
+       t1->check = csum_ipv6_magic(fl.fl6_src, fl.fl6_dst, 
                                    sizeof(*t1), IPPROTO_TCP,
                                    buff->csum);
 
        fl.proto = IPPROTO_TCP;
        fl.oif = tcp_v6_iif(skb);
-       fl.uli_u.ports.dport = t1->dest;
-       fl.uli_u.ports.sport = t1->source;
+       fl.fl_ip_dport = t1->dest;
+       fl.fl_ip_sport = t1->source;
 
        /* sk = NULL, but it is safe for now. RST socket required. */
        buff->dst = ip6_route_output(NULL, &fl);
@@ -1084,19 +1083,18 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32
 
        buff->csum = csum_partial((char *)t1, tot_len, 0);
 
-       fl.nl_u.ip6_u.daddr = &skb->nh.ipv6h->saddr;
-       fl.nl_u.ip6_u.saddr = &skb->nh.ipv6h->daddr;
+       fl.fl6_dst = &skb->nh.ipv6h->saddr;
+       fl.fl6_src = &skb->nh.ipv6h->daddr;
        fl.fl6_flowlabel = 0;
 
-       t1->check = csum_ipv6_magic(fl.nl_u.ip6_u.saddr,
-                                   fl.nl_u.ip6_u.daddr, 
+       t1->check = csum_ipv6_magic(fl.fl6_src, fl.fl6_dst, 
                                    tot_len, IPPROTO_TCP,
                                    buff->csum);
 
        fl.proto = IPPROTO_TCP;
        fl.oif = tcp_v6_iif(skb);
-       fl.uli_u.ports.dport = t1->dest;
-       fl.uli_u.ports.sport = t1->source;
+       fl.fl_ip_dport = t1->dest;
+       fl.fl_ip_sport = t1->source;
 
        buff->dst = ip6_route_output(NULL, &fl);
 
@@ -1335,16 +1333,16 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 
        if (dst == NULL) {
                fl.proto = IPPROTO_TCP;
-               fl.nl_u.ip6_u.daddr = &req->af.v6_req.rmt_addr;
+               fl.fl6_dst = &req->af.v6_req.rmt_addr;
                if (opt && opt->srcrt) {
                        struct rt0_hdr *rt0 = (struct rt0_hdr *) opt->srcrt;
-                       fl.nl_u.ip6_u.daddr = rt0->addr;
+                       fl.fl6_dst = rt0->addr;
                }
-               fl.nl_u.ip6_u.saddr = &req->af.v6_req.loc_addr;
+               fl.fl6_src = &req->af.v6_req.loc_addr;
                fl.fl6_flowlabel = 0;
                fl.oif = sk->bound_dev_if;
-               fl.uli_u.ports.dport = req->rmt_port;
-               fl.uli_u.ports.sport = inet_sk(sk)->sport;
+               fl.fl_ip_dport = req->rmt_port;
+               fl.fl_ip_sport = inet_sk(sk)->sport;
 
                dst = ip6_route_output(sk, &fl);
        }
@@ -1732,16 +1730,16 @@ static int tcp_v6_rebuild_header(struct sock *sk)
                struct flowi fl;
 
                fl.proto = IPPROTO_TCP;
-               fl.nl_u.ip6_u.daddr = &np->daddr;
-               fl.nl_u.ip6_u.saddr = &np->saddr;
+               fl.fl6_dst = &np->daddr;
+               fl.fl6_src = &np->saddr;
                fl.fl6_flowlabel = np->flow_label;
                fl.oif = sk->bound_dev_if;
-               fl.uli_u.ports.dport = inet->dport;
-               fl.uli_u.ports.sport = inet->sport;
+               fl.fl_ip_dport = inet->dport;
+               fl.fl_ip_sport = inet->sport;
 
                if (np->opt && np->opt->srcrt) {
                        struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt;
-                       fl.nl_u.ip6_u.daddr = rt0->addr;
+                       fl.fl6_dst = rt0->addr;
                }
 
                dst = ip6_route_output(sk, &fl);
@@ -1774,12 +1772,12 @@ static int tcp_v6_xmit(struct sk_buff *skb, int ipfragok)
        fl.fl6_flowlabel = np->flow_label;
        IP6_ECN_flow_xmit(sk, fl.fl6_flowlabel);
        fl.oif = sk->bound_dev_if;
-       fl.uli_u.ports.sport = inet->sport;
-       fl.uli_u.ports.dport = inet->dport;
+       fl.fl_ip_sport = inet->sport;
+       fl.fl_ip_dport = inet->dport;
 
        if (np->opt && np->opt->srcrt) {
                struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt;
-               fl.nl_u.ip6_u.daddr = rt0->addr;
+               fl.fl6_dst = rt0->addr;
        }
 
        dst = __sk_dst_check(sk, np->dst_cookie);
@@ -1799,7 +1797,7 @@ static int tcp_v6_xmit(struct sk_buff *skb, int ipfragok)
        skb->dst = dst_clone(dst);
 
        /* Restore final destination back after routing done */
-       fl.nl_u.ip6_u.daddr = &np->daddr;
+       fl.fl6_dst = &np->daddr;
 
        return ip6_xmit(sk, skb, &fl, np->opt);
 }

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index a25394f3f6ffc74f0718589f21d511defa7e8f46..4e043c5d77004d9a566718d3fa785a0fe9e09752 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -352,8 +352,8 @@ ipv4_connected:
        fl.fl6_dst = &np->daddr;
        fl.fl6_src = &saddr;
        fl.oif = sk->bound_dev_if;
-       fl.uli_u.ports.dport = inet->dport;
-       fl.uli_u.ports.sport = inet->sport;
+       fl.fl_ip_dport = inet->dport;
+       fl.fl_ip_sport = inet->sport;
 
        if (!fl.oif && (addr_type&IPV6_ADDR_MULTICAST))
                fl.oif = np->mcast_oif;
@@ -936,8 +936,8 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg
        fl.fl6_dst = daddr;
        if (fl.fl6_src == NULL && !ipv6_addr_any(&np->saddr))
                fl.fl6_src = &np->saddr;
-       fl.uli_u.ports.dport = udh.uh.dest;
-       fl.uli_u.ports.sport = udh.uh.source;
+       fl.fl_ip_dport = udh.uh.dest;
+       fl.fl_ip_sport = udh.uh.source;
 
        err = ip6_build_xmit(sk, udpv6_getfrag, &udh, &fl, len, opt, hlimit,
                             msg->msg_flags);

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 638f36edad579bf482dcbd5026a94ec9a06f2f00..ae8d8b7778aae4e5f692761b4e921202cc533f97 100644 (file)
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -195,8 +195,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
                        if (pskb_may_pull(skb, skb->nh.raw + offset + 4 - skb->data)) {
                                u16 *ports = (u16 *)exthdr;
 
-                               fl->uli_u.ports.sport = ports[0];
-                               fl->uli_u.ports.dport = ports[1];
+                               fl->fl_ip_sport = ports[0];
+                               fl->fl_ip_dport = ports[1];
                        }
                        return;
 
@@ -205,7 +205,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
                case IPPROTO_ESP:
                case IPPROTO_COMP:
                default:
-                       fl->uli_u.spi = 0;
+                       fl->fl_ipsec_spi = 0;
                        return;
                };
        }

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 259ed5e0249bc87323c41ed735ebf9c30c4a3fe6..7f2773d4dafd681662cf854951e98e958460c4be 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -27,9 +27,9 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl,
         * to current session. */
        memcpy(&x->sel.daddr, fl->fl6_dst, sizeof(struct in6_addr));
        memcpy(&x->sel.saddr, fl->fl6_src, sizeof(struct in6_addr));
-       x->sel.dport = fl->uli_u.ports.dport;
+       x->sel.dport = fl->fl_ip_dport;
        x->sel.dport_mask = ~0;
-       x->sel.sport = fl->uli_u.ports.sport;
+       x->sel.sport = fl->fl_ip_sport;
        x->sel.sport_mask = ~0;
        x->sel.prefixlen_d = 128;
        x->sel.prefixlen_s = 128;

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 7e5ab6c9342d59e64272012bc1a671d49b1b54c1..a4fc68d5d1ee62292a93e38ea63b29ea45500c1c 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -165,8 +165,8 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport,
                fl.oif = transport->saddr.v6.sin6_scope_id;
        else
                fl.oif = sk->bound_dev_if;
-       fl.uli_u.ports.sport = inet_sk(sk)->sport;
-       fl.uli_u.ports.dport = transport->ipaddr.v6.sin6_port;
+       fl.fl_ip_sport = inet_sk(sk)->sport;
+       fl.fl_ip_dport = transport->ipaddr.v6.sin6_port;
 
        if (np->opt && np->opt->srcrt) {
                struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt;