| Message ID | 20110304093507.GG10761@canuck.infradead.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 03/04/11 01:35, Thomas Graf wrote: > exthdrs_core.c and addrconf_core.c in net/ipv6/ contain bits which > must be made available even if IPv6 is disabled. > > net/ipv6/Makefile already correctly includes them if CONFIG_IPV6=n > but net/Makefile prevents entering the subdirectory. > > Signed-off-by: Thomas Graf <tgraf@infradead.org> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks. > > diff --git a/net/Makefile b/net/Makefile > index a3330eb..a51d946 100644 > --- a/net/Makefile > +++ b/net/Makefile > @@ -19,9 +19,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ > obj-$(CONFIG_INET) += ipv4/ > obj-$(CONFIG_XFRM) += xfrm/ > obj-$(CONFIG_UNIX) += unix/ > -ifneq ($(CONFIG_IPV6),) > -obj-y += ipv6/ > -endif > +obj-$(CONFIG_NET) += ipv6/ > obj-$(CONFIG_PACKET) += packet/ > obj-$(CONFIG_NET_KEY) += key/ > obj-$(CONFIG_BRIDGE) += bridge/
From: Randy Dunlap <randy.dunlap@oracle.com> Date: Fri, 04 Mar 2011 09:01:54 -0800 > On 03/04/11 01:35, Thomas Graf wrote: >> exthdrs_core.c and addrconf_core.c in net/ipv6/ contain bits which >> must be made available even if IPv6 is disabled. >> >> net/ipv6/Makefile already correctly includes them if CONFIG_IPV6=n >> but net/Makefile prevents entering the subdirectory. >> >> Signed-off-by: Thomas Graf <tgraf@infradead.org> > > Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Applied, thanks. -- 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
diff --git a/net/Makefile b/net/Makefile index a3330eb..a51d946 100644 --- a/net/Makefile +++ b/net/Makefile @@ -19,9 +19,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ -ifneq ($(CONFIG_IPV6),) -obj-y += ipv6/ -endif +obj-$(CONFIG_NET) += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/
exthdrs_core.c and addrconf_core.c in net/ipv6/ contain bits which must be made available even if IPv6 is disabled. net/ipv6/Makefile already correctly includes them if CONFIG_IPV6=n but net/Makefile prevents entering the subdirectory. Signed-off-by: Thomas Graf <tgraf@infradead.org> -- 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