OpenVZ Forum - RDF feed
type: channel
items: [patch 08/38][IPV6] inet6_addr - remove ipv6_get_ifaddr wrapper

[patch 08/38][IPV6] inet6_addr - remove ipv6_get_ifaddr wrapper
type: item
description: The previous patch introduced a new parameter to the ipv6_get_ifaddr function and made a wrapper around it in order to reduce the impact of the patch and to facilitate code review. This patch removes the wrapper and propagate the function change to all callers. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> --- include/net/addrconf.h | 15 ++++----------- net/ipv6/addrconf.c | 10 +++++----- net/ipv6/ip6_output.c | 3 ++- net/ipv6/ndisc.c | 9 +++++---- 4 files changed, 16 insertions(+), 21 deletions(-) Index: linux-2.6-netns/include/net/addrconf.h =================================================================== --- linux-2.6-netns.orig/include/net/addrconf.h +++ linux-2.6-netns/include/net/addrconf.h @@ -66,17 +66,10 @@ extern int ipv6_chk_addr(struct net *n #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE) extern int ipv6_chk_home_addr(struct in6_addr *addr); #endif -extern struct inet6_ifaddr *__ipv6_get_ifaddr(struct net *net, - struct in6_addr *addr, - struct net_device *dev, - int strict); - -static inline struct inet6_ifaddr *ipv6_get_ifaddr(struct in6_addr *addr, - struct net_device *dev, - int strict) -{ - return __ipv6_get_ifaddr(&init_net, addr, dev, strict); -} +extern struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, + struct in6_addr *addr, + struct net_device *dev, + int strict); extern int ipv6_get_saddr(struct dst_entry *dst, struct in6_addr *daddr, Index: linux-2.6-netns/net/ipv6/addrconf.c =================================================================== --- linux-2.6-netns.orig/net/ipv6/addrconf.c +++ linux-2.6-netns/net/ipv6/addrconf.c @@ -1223,8 +1223,8 @@ int ipv6_chk_same_addr(struct net *net, return ifp != NULL; } -struct inet6_ifaddr * __ipv6_get_ifaddr(struct net *net, struct in6_addr *addr, - struct net_device *dev, int strict) +struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, struct in6_addr *addr, + struct net_device *dev, int strict) { struct inet6_i…
creator: Daniel Lezcano
date: 2007-12-03T16:16:44-00:00