From patchwork Thu Mar 17 08:01:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 87352 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4BE4DB6FDE for ; Thu, 17 Mar 2011 19:01:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752341Ab1CQIAx (ORCPT ); Thu, 17 Mar 2011 04:00:53 -0400 Received: from vpn.id2.novell.com ([195.33.99.129]:39058 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752303Ab1CQIAv convert rfc822-to-8bit (ORCPT ); Thu, 17 Mar 2011 04:00:51 -0400 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Thu, 17 Mar 2011 08:51:41 +0000 Message-Id: <4D81CDF6020000780003700B@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Thu, 17 Mar 2011 08:01:42 +0000 From: "Jan Beulich" To: "Stephen Hemminger" Cc: , , , Subject: Re: build breakage due to br_multicast.c referencing ipv6_dev_get_saddr() References: <4D80BC5B0200007800036D85@vpn.id2.novell.com> <20110316082441.45db3018@nehalam> In-Reply-To: <20110316082441.45db3018@nehalam> Mime-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org >>> On 16.03.11 at 16:24, Stephen Hemminger wrote: > On Wed, 16 Mar 2011 12:34:19 +0000 > "Jan Beulich" wrote: > >> With BRIDGE=y and IPV6=m commit >> fe29ec41aaa51902aebd63658dfb04fe6fea8be5 ("bridge: Use IPv6 >> link-local address for multicast listener queries") causes the build to >> break. > > Rather than continue with the config games, lets just make the necessary > ipv6 pieces accessible. The below (however ugly it may look) seems to do the trick for me, for this particular symbol. Possibly other symbols need doing the same (didn't check which ones e.g. infiniband depends on), so some sort of abstraction might be desirable to make the whole thing look less ugly. Jan --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -78,7 +78,21 @@ extern struct inet6_ifaddr *ipv6_ge struct net_device *dev, int strict); -extern int ipv6_dev_get_saddr(struct net *net, +#ifdef CONFIG_IPV6_MODULE +static inline int ipv6_dev_get_saddr_stub(struct net *net, + struct net_device *dev, + const struct in6_addr *daddr, + unsigned int srcprefs, + struct in6_addr *saddr) +{ + return -EPROTONOSUPPORT; +} + +extern int (*ipv6_dev_get_saddr) +#else +extern int ipv6_dev_get_saddr +#endif + (struct net *net, struct net_device *dev, const struct in6_addr *daddr, unsigned int srcprefs, --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1119,9 +1119,14 @@ out: return ret; } -int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, - const struct in6_addr *daddr, unsigned int prefs, - struct in6_addr *saddr) +#ifdef MODULE +static int _ipv6_dev_get_saddr +#else +int ipv6_dev_get_saddr +#endif + (struct net *net, struct net_device *dst_dev, + const struct in6_addr *daddr, unsigned int prefs, + struct in6_addr *saddr) { struct ipv6_saddr_score scores[2], *score = &scores[0], *hiscore = &scores[1]; @@ -1244,7 +1249,6 @@ try_nextdev: in6_ifa_put(hiscore->ifa); return 0; } -EXPORT_SYMBOL(ipv6_dev_get_saddr); int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags) @@ -4720,6 +4724,10 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); +#ifdef MODULE + ipv6_dev_get_saddr = _ipv6_dev_get_saddr; +#endif + return 0; errout: rtnl_af_unregister(&inet6_ops); @@ -4738,6 +4746,10 @@ void addrconf_cleanup(void) struct net_device *dev; int i; +#ifdef MODULE + ipv6_dev_get_saddr = ipv6_dev_get_saddr_stub; +#endif + unregister_netdevice_notifier(&ipv6_dev_notf); unregister_pernet_subsys(&addrconf_ops); ipv6_addr_label_cleanup(); --- a/net/ipv6/addrconf_core.c +++ b/net/ipv6/addrconf_core.c @@ -3,10 +3,17 @@ * not configured or static. */ +#include #include #define IPV6_ADDR_SCOPE_TYPE(scope) ((scope) << 16) +#ifdef CONFIG_IPV6_MODULE +typeof(ipv6_dev_get_saddr) __read_mostly ipv6_dev_get_saddr + = ipv6_dev_get_saddr_stub; +#endif +EXPORT_SYMBOL_GPL(ipv6_dev_get_saddr); + static inline unsigned ipv6_addr_scope2type(unsigned scope) { switch(scope) {