From: Rusty Russell There is no "ports" parameter for the ip_nat_ftp and ip_nat_irc modules in 2.6.11: the ports parameter supplied to the ip_conntrack_ftp/ip_conntrack_irc module defines the ports. It was unfortunate that we were lazy in the original implementation, and forced the user to duplicate the arguments. Even more unfortunate, the removal of the parameter caused autoloading to break for various setups, with an "Unknown parameter" message. The solution is to restore the parameter as a dummy, with a polite warning message that it is no longer neccessary. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton --- 25-akpm/net/ipv4/netfilter/ip_nat_ftp.c | 9 +++++++++ 25-akpm/net/ipv4/netfilter/ip_nat_irc.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff -puN net/ipv4/netfilter/ip_nat_ftp.c~restore-ports-module-parameter-for-ip_nat_ftp-and-ip_nat_irc net/ipv4/netfilter/ip_nat_ftp.c --- 25/net/ipv4/netfilter/ip_nat_ftp.c~restore-ports-module-parameter-for-ip_nat_ftp-and-ip_nat_irc 2005-03-22 18:23:00.000000000 -0800 +++ 25-akpm/net/ipv4/netfilter/ip_nat_ftp.c 2005-03-22 18:23:00.000000000 -0800 @@ -170,5 +170,14 @@ static int __init init(void) return 0; } +/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ +static int warn_set(const char *val, struct kernel_param *kp) +{ + printk(KERN_INFO __stringify(KBUILD_MODNAME) + ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); + return 0; +} +module_param_call(ports, warn_set, NULL, NULL, 0); + module_init(init); module_exit(fini); diff -puN net/ipv4/netfilter/ip_nat_irc.c~restore-ports-module-parameter-for-ip_nat_ftp-and-ip_nat_irc net/ipv4/netfilter/ip_nat_irc.c --- 25/net/ipv4/netfilter/ip_nat_irc.c~restore-ports-module-parameter-for-ip_nat_ftp-and-ip_nat_irc 2005-03-22 18:23:00.000000000 -0800 +++ 25-akpm/net/ipv4/netfilter/ip_nat_irc.c 2005-03-22 18:23:00.000000000 -0800 @@ -112,5 +112,14 @@ static int __init init(void) return 0; } +/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ +static int warn_set(const char *val, struct kernel_param *kp) +{ + printk(KERN_INFO __stringify(KBUILD_MODNAME) + ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); + return 0; +} +module_param_call(ports, warn_set, NULL, NULL, 0); + module_init(init); module_exit(fini); _