| Message ID | 20150121105350.77e77534@kryten |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
On Wed, Jan 21, 2015 at 10:53:50AM +1100, Anton Blanchard wrote: > Docker needs NETFILTER_XT_MATCH_ADDRTYPE, so move it out from behind > NETFILTER_ADVANCED and make it default to a module. Missed this little one, applied thanks. > Signed-off-by: Anton Blanchard <anton@samba.org> > --- > net/netfilter/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig > index b02660f..c68c3b4 100644 > --- a/net/netfilter/Kconfig > +++ b/net/netfilter/Kconfig > @@ -951,7 +951,7 @@ comment "Xtables matches" > > config NETFILTER_XT_MATCH_ADDRTYPE > tristate '"addrtype" address type match support' > - depends on NETFILTER_ADVANCED > + default m if NETFILTER_ADVANCED=n > ---help--- > This option allows you to match what routing thinks of an address, > eg. UNICAST, LOCAL, BROADCAST, ... > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" 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/netfilter/Kconfig b/net/netfilter/Kconfig index b02660f..c68c3b4 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -951,7 +951,7 @@ comment "Xtables matches" config NETFILTER_XT_MATCH_ADDRTYPE tristate '"addrtype" address type match support' - depends on NETFILTER_ADVANCED + default m if NETFILTER_ADVANCED=n ---help--- This option allows you to match what routing thinks of an address, eg. UNICAST, LOCAL, BROADCAST, ...
Docker needs NETFILTER_XT_MATCH_ADDRTYPE, so move it out from behind NETFILTER_ADVANCED and make it default to a module. Signed-off-by: Anton Blanchard <anton@samba.org> --- net/netfilter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)