summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2008-08-16 14:44:17 +1000
committerSimon Horman <horms@verge.net.au>2008-08-16 14:44:17 +1000
commit51df1901394a714d1a17202da02ae4957260eab5 (patch)
tree952d76cf7186dd6099d40f4204e0df7b9539e8fc /include
parent4a031b0e6acd8a8c23725ceb5db6a0aa5c4e231f (diff)
parent23197916c447a1623d196e6547781180905f0bb2 (diff)
downloadop-kernel-dev-51df1901394a714d1a17202da02ae4957260eab5.zip
op-kernel-dev-51df1901394a714d1a17202da02ae4957260eab5.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/addrconf.h3
-rw-r--r--include/net/ip6_route.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 06b2814..c216de5 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 bc391ba..5f53db7 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);
OpenPOWER on IntegriCloud