diff options
author | Brian Haley <brian.haley@hp.com> | 2008-08-27 22:30:52 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-09-08 04:44:23 -0700 |
commit | 7b29aece66858d8ee1fb10ca413fda072bfa74b6 (patch) | |
tree | 4eb2a605fbeba13bf3420d36c45de334cf4d8296 /include | |
parent | 2b02f3dddb2b9df4aed0758f36729d0a5c3bcede (diff) |
netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()
[ Upstream commit 191cd582500f49b32a63040fedeebb0168c720af ]
ipv6_dev_get_saddr() blindly de-references dst_dev to get the network
namespace, but some callers might pass NULL. Change callers to pass a
namespace pointer instead.
Signed-off-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/addrconf.h | 3 | ||||
-rw-r--r-- | include/net/ip6_route.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index bbd3d583c6e6..99ca7cdf54b4 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 9313491e3dad..03462e550489 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -112,6 +112,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); |