Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / include / net / addrconf.h

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index a9ff97c120c7d428e01f11f62c5f1bace6a7038f..232da20e7171c8314046ab367fb2428df8844321 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -55,9 +55,12 @@ struct prefix_info {
 extern int                     addrconf_init(void);
 extern void                    addrconf_cleanup(void);
 
-extern int                     addrconf_add_ifaddr(void __user *arg);
-extern int                     addrconf_del_ifaddr(void __user *arg);
-extern int                     addrconf_set_dstaddr(void __user *arg);
+extern int                     addrconf_add_ifaddr(struct net *net,
+                                                   void __user *arg);
+extern int                     addrconf_del_ifaddr(struct net *net,
+                                                   void __user *arg);
+extern int                     addrconf_set_dstaddr(struct net *net,
+                                                    void __user *arg);
 
 extern int                     ipv6_chk_addr(struct net *net,
                                              struct in6_addr *addr,
@@ -73,9 +76,6 @@ extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
                                                 struct net_device *dev,
                                                 int strict);
 
-extern int                     ipv6_get_saddr(struct dst_entry *dst, 
-                                              struct in6_addr *daddr,
-                                              struct in6_addr *saddr);
 extern int                     ipv6_dev_get_saddr(struct net_device *dev, 
                                               struct in6_addr *daddr,
                                               struct in6_addr *saddr);