diff options
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f032d770094..c1515a3c130 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -356,7 +356,7 @@ out: | |||
356 | #ifdef CONFIG_IPV6_ROUTER_PREF | 356 | #ifdef CONFIG_IPV6_ROUTER_PREF |
357 | static void rt6_probe(struct rt6_info *rt) | 357 | static void rt6_probe(struct rt6_info *rt) |
358 | { | 358 | { |
359 | struct neighbour *neigh = rt ? rt->rt6i_nexthop : NULL; | 359 | struct neighbour *neigh = rt ? rt->dst.neighbour : NULL; |
360 | /* | 360 | /* |
361 | * Okay, this does not seem to be appropriate | 361 | * Okay, this does not seem to be appropriate |
362 | * for now, however, we need to check if it | 362 | * for now, however, we need to check if it |
@@ -404,7 +404,7 @@ static inline int rt6_check_dev(struct rt6_info *rt, int oif) | |||
404 | 404 | ||
405 | static inline int rt6_check_neigh(struct rt6_info *rt) | 405 | static inline int rt6_check_neigh(struct rt6_info *rt) |
406 | { | 406 | { |
407 | struct neighbour *neigh = rt->rt6i_nexthop; | 407 | struct neighbour *neigh = rt->dst.neighbour; |
408 | int m; | 408 | int m; |
409 | if (rt->rt6i_flags & RTF_NONEXTHOP || | 409 | if (rt->rt6i_flags & RTF_NONEXTHOP || |
410 | !(rt->rt6i_flags & RTF_GATEWAY)) | 410 | !(rt->rt6i_flags & RTF_GATEWAY)) |
@@ -745,7 +745,7 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, const struct in6_add | |||
745 | dst_free(&rt->dst); | 745 | dst_free(&rt->dst); |
746 | return NULL; | 746 | return NULL; |
747 | } | 747 | } |
748 | rt->rt6i_nexthop = neigh; | 748 | rt->dst.neighbour = neigh; |
749 | 749 | ||
750 | } | 750 | } |
751 | 751 | ||
@@ -760,7 +760,7 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, const struct in6_a | |||
760 | rt->rt6i_dst.plen = 128; | 760 | rt->rt6i_dst.plen = 128; |
761 | rt->rt6i_flags |= RTF_CACHE; | 761 | rt->rt6i_flags |= RTF_CACHE; |
762 | rt->dst.flags |= DST_HOST; | 762 | rt->dst.flags |= DST_HOST; |
763 | rt->rt6i_nexthop = neigh_clone(ort->rt6i_nexthop); | 763 | rt->dst.neighbour = neigh_clone(ort->dst.neighbour); |
764 | } | 764 | } |
765 | return rt; | 765 | return rt; |
766 | } | 766 | } |
@@ -794,7 +794,7 @@ restart: | |||
794 | dst_hold(&rt->dst); | 794 | dst_hold(&rt->dst); |
795 | read_unlock_bh(&table->tb6_lock); | 795 | read_unlock_bh(&table->tb6_lock); |
796 | 796 | ||
797 | if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) | 797 | if (!rt->dst.neighbour && !(rt->rt6i_flags & RTF_NONEXTHOP)) |
798 | nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr); | 798 | nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr); |
799 | else if (!(rt->dst.flags & DST_HOST)) | 799 | else if (!(rt->dst.flags & DST_HOST)) |
800 | nrt = rt6_alloc_clone(rt, &fl6->daddr); | 800 | nrt = rt6_alloc_clone(rt, &fl6->daddr); |
@@ -1058,7 +1058,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, | |||
1058 | } | 1058 | } |
1059 | 1059 | ||
1060 | rt->rt6i_idev = idev; | 1060 | rt->rt6i_idev = idev; |
1061 | rt->rt6i_nexthop = neigh; | 1061 | rt->dst.neighbour = neigh; |
1062 | atomic_set(&rt->dst.__refcnt, 1); | 1062 | atomic_set(&rt->dst.__refcnt, 1); |
1063 | dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255); | 1063 | dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 255); |
1064 | rt->dst.output = ip6_output; | 1064 | rt->dst.output = ip6_output; |
@@ -1338,10 +1338,10 @@ int ip6_route_add(struct fib6_config *cfg) | |||
1338 | rt->rt6i_prefsrc.plen = 0; | 1338 | rt->rt6i_prefsrc.plen = 0; |
1339 | 1339 | ||
1340 | if (cfg->fc_flags & (RTF_GATEWAY | RTF_NONEXTHOP)) { | 1340 | if (cfg->fc_flags & (RTF_GATEWAY | RTF_NONEXTHOP)) { |
1341 | rt->rt6i_nexthop = __neigh_lookup_errno(&nd_tbl, &rt->rt6i_gateway, dev); | 1341 | rt->dst.neighbour = __neigh_lookup_errno(&nd_tbl, &rt->rt6i_gateway, dev); |
1342 | if (IS_ERR(rt->rt6i_nexthop)) { | 1342 | if (IS_ERR(rt->dst.neighbour)) { |
1343 | err = PTR_ERR(rt->rt6i_nexthop); | 1343 | err = PTR_ERR(rt->dst.neighbour); |
1344 | rt->rt6i_nexthop = NULL; | 1344 | rt->dst.neighbour = NULL; |
1345 | goto out; | 1345 | goto out; |
1346 | } | 1346 | } |
1347 | } | 1347 | } |
@@ -1590,7 +1590,7 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src, | |||
1590 | nrt->dst.flags |= DST_HOST; | 1590 | nrt->dst.flags |= DST_HOST; |
1591 | 1591 | ||
1592 | ipv6_addr_copy(&nrt->rt6i_gateway, (struct in6_addr*)neigh->primary_key); | 1592 | ipv6_addr_copy(&nrt->rt6i_gateway, (struct in6_addr*)neigh->primary_key); |
1593 | nrt->rt6i_nexthop = neigh_clone(neigh); | 1593 | nrt->dst.neighbour = neigh_clone(neigh); |
1594 | 1594 | ||
1595 | if (ip6_ins_rt(nrt)) | 1595 | if (ip6_ins_rt(nrt)) |
1596 | goto out; | 1596 | goto out; |
@@ -1670,7 +1670,7 @@ again: | |||
1670 | 1. It is connected route. Action: COW | 1670 | 1. It is connected route. Action: COW |
1671 | 2. It is gatewayed route or NONEXTHOP route. Action: clone it. | 1671 | 2. It is gatewayed route or NONEXTHOP route. Action: clone it. |
1672 | */ | 1672 | */ |
1673 | if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) | 1673 | if (!rt->dst.neighbour && !(rt->rt6i_flags & RTF_NONEXTHOP)) |
1674 | nrt = rt6_alloc_cow(rt, daddr, saddr); | 1674 | nrt = rt6_alloc_cow(rt, daddr, saddr); |
1675 | else | 1675 | else |
1676 | nrt = rt6_alloc_clone(rt, daddr); | 1676 | nrt = rt6_alloc_clone(rt, daddr); |
@@ -2035,7 +2035,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | |||
2035 | 2035 | ||
2036 | return ERR_CAST(neigh); | 2036 | return ERR_CAST(neigh); |
2037 | } | 2037 | } |
2038 | rt->rt6i_nexthop = neigh; | 2038 | rt->dst.neighbour = neigh; |
2039 | 2039 | ||
2040 | ipv6_addr_copy(&rt->rt6i_dst.addr, addr); | 2040 | ipv6_addr_copy(&rt->rt6i_dst.addr, addr); |
2041 | rt->rt6i_dst.plen = 128; | 2041 | rt->rt6i_dst.plen = 128; |
@@ -2594,8 +2594,8 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg) | |||
2594 | seq_puts(m, "00000000000000000000000000000000 00 "); | 2594 | seq_puts(m, "00000000000000000000000000000000 00 "); |
2595 | #endif | 2595 | #endif |
2596 | 2596 | ||
2597 | if (rt->rt6i_nexthop) { | 2597 | if (rt->dst.neighbour) { |
2598 | seq_printf(m, "%pi6", rt->rt6i_nexthop->primary_key); | 2598 | seq_printf(m, "%pi6", rt->dst.neighbour->primary_key); |
2599 | } else { | 2599 | } else { |
2600 | seq_puts(m, "00000000000000000000000000000000"); | 2600 | seq_puts(m, "00000000000000000000000000000000"); |
2601 | } | 2601 | } |