Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 475b10c575b38ec1c137ebab2953adb21278aad0..59b70624b0563fdc93ecfbc25291a7845502d117 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -24,6 +24,7 @@ enum {
        ND_OPT_MTU = 5,                 /* RFC2461 */
        __ND_OPT_ARRAY_MAX,
        ND_OPT_ROUTE_INFO = 24,         /* RFC4191 */
+       ND_OPT_RDNSS = 25,              /* RFC5006 */
        __ND_OPT_MAX
 };
 
@@ -102,7 +103,6 @@ extern void                 ndisc_send_redirect(struct sk_buff *skb,
 extern int                     ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir);
 
 
-struct rt6_info *              dflt_rt_lookup(void);
 
 /*
  *     IGMP