linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / ipv6 / ndisc.c

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index b50055b..cb8856b 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -48,6 +48,7 @@
 #endif
 
 #include <linux/module.h>
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -155,11 +156,7 @@ struct neigh_table nd_tbl = {
 
 /* ND options */
 struct ndisc_options {
-       struct nd_opt_hdr *nd_opt_array[__ND_OPT_ARRAY_MAX];
-#ifdef CONFIG_IPV6_ROUTE_INFO
-       struct nd_opt_hdr *nd_opts_ri;
-       struct nd_opt_hdr *nd_opts_ri_end;
-#endif
+       struct nd_opt_hdr *nd_opt_array[__ND_OPT_MAX];
 };
 
 #define nd_opts_src_lladdr     nd_opt_array[ND_OPT_SOURCE_LL_ADDR]
@@ -258,13 +255,6 @@ static struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len,
                        if (ndopts->nd_opt_array[nd_opt->nd_opt_type] == 0)
                                ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt;
                        break;
-#ifdef CONFIG_IPV6_ROUTE_INFO
-               case ND_OPT_ROUTE_INFO:
-                       ndopts->nd_opts_ri_end = nd_opt;
-                       if (!ndopts->nd_opts_ri)
-                               ndopts->nd_opts_ri = nd_opt;
-                       break;
-#endif
                default:
                        /*
                         * Unknown options must be silently ignored,
@@ -1029,11 +1019,10 @@ static void ndisc_router_discovery(struct sk_buff *skb)
         struct ra_msg *ra_msg = (struct ra_msg *) skb->h.raw;
        struct neighbour *neigh = NULL;
        struct inet6_dev *in6_dev;
-       struct rt6_info *rt = NULL;
+       struct rt6_info *rt;
        int lifetime;
        struct ndisc_options ndopts;
        int optlen;
-       unsigned int pref = 0;
 
        __u8 * opt = (__u8 *)(ra_msg + 1);
 
@@ -1092,19 +1081,8 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                                (ra_msg->icmph.icmp6_addrconf_other ?
                                        IF_RA_OTHERCONF : 0);
 
-       if (!in6_dev->cnf.accept_ra_defrtr)
-               goto skip_defrtr;
-
        lifetime = ntohs(ra_msg->icmph.icmp6_rt_lifetime);
 
-#ifdef CONFIG_IPV6_ROUTER_PREF
-       pref = ra_msg->icmph.icmp6_router_pref;
-       /* 10b is handled as if it were 00b (medium) */
-       if (pref == ICMPV6_ROUTER_PREF_INVALID ||
-           in6_dev->cnf.accept_ra_rtr_pref)
-               pref = ICMPV6_ROUTER_PREF_MEDIUM;
-#endif
-
        rt = rt6_get_dflt_router(&skb->nh.ipv6h->saddr, skb->dev);
 
        if (rt)
@@ -1120,7 +1098,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                ND_PRINTK3(KERN_DEBUG
                           "ICMPv6 RA: adding default router.\n");
 
-               rt = rt6_add_dflt_router(&skb->nh.ipv6h->saddr, skb->dev, pref);
+               rt = rt6_add_dflt_router(&skb->nh.ipv6h->saddr, skb->dev);
                if (rt == NULL) {
                        ND_PRINTK0(KERN_ERR
                                   "ICMPv6 RA: %s() failed to add default route.\n",
@@ -1139,8 +1117,6 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                        return;
                }
                neigh->flags |= NTF_ROUTER;
-       } else if (rt) {
-               rt->rt6i_flags |= (rt->rt6i_flags & ~RTF_PREF_MASK) | RTF_PREF(pref);
        }
 
        if (rt)
@@ -1152,8 +1128,6 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                        rt->u.dst.metrics[RTAX_HOPLIMIT-1] = ra_msg->icmph.icmp6_hop_limit;
        }
 
-skip_defrtr:
-
        /*
         *      Update Reachable Time and Retrans Timer
         */
@@ -1212,21 +1186,7 @@ skip_defrtr:
                             NEIGH_UPDATE_F_ISROUTER);
        }
 
-#ifdef CONFIG_IPV6_ROUTE_INFO
-       if (in6_dev->cnf.accept_ra_rtr_pref && ndopts.nd_opts_ri) {
-               struct nd_opt_hdr *p;
-               for (p = ndopts.nd_opts_ri;
-                    p;
-                    p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
-                       if (((struct route_info *)p)->prefix_len > in6_dev->cnf.accept_ra_rt_info_max_plen)
-                               continue;
-                       rt6_route_rcv(skb->dev, (u8*)p, (p->nd_opt_len) << 3,
-                                     &skb->nh.ipv6h->saddr);
-               }
-       }
-#endif
-
-       if (in6_dev->cnf.accept_ra_pinfo && ndopts.nd_opts_pi) {
+       if (ndopts.nd_opts_pi) {
                struct nd_opt_hdr *p;
                for (p = ndopts.nd_opts_pi;
                     p;