diff options
| author | Brian Haley <brian.haley@hp.com> | 2008-08-14 15:33:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-14 15:33:21 -0700 |
| commit | 191cd582500f49b32a63040fedeebb0168c720af (patch) | |
| tree | 173ce9682d77798c6e4ca7e14af57ea2f46c55b8 /include/net | |
| parent | 0eb8b1fe9238ca4c1797e4c105d5790abda1726f (diff) | |
| download | blackbird-op-linux-191cd582500f49b32a63040fedeebb0168c720af.tar.gz blackbird-op-linux-191cd582500f49b32a63040fedeebb0168c720af.zip | |
netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()
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>
Diffstat (limited to 'include/net')
| -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 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); |
