Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2 files changed, 3 insertions, 1 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 06b28142b3ab..c216de528b08 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -80,7 +80,8 @@ extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
                                                  struct net_device *dev,
                                                  int strict);
 
-extern int                      ipv6_dev_get_saddr(struct net_device *dev, 
+extern int                      ipv6_dev_get_saddr(struct net *net,
+                                               struct net_device *dev,
                                                const struct in6_addr *daddr,
                                                unsigned int srcprefs,
                                                struct in6_addr *saddr);
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index bc391ba101e9..5f53db7e4e57 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -107,6 +107,7 @@ struct rt6_rtnl_dump_arg
 {
         struct sk_buff *skb;
         struct netlink_callback *cb;
+        struct net *net;
 };
 
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);