ChangeSet 1.2181.41.2, 2005/03/30 16:33:25-08:00, [EMAIL PROTECTED]
[NETFILTER]: Restore ports module parameter for ip_nat_{ftp,irq}
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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
ip_nat_ftp.c | 9 +++++++++
ip_nat_irc.c | 9 +++++++++
2 files changed, 18 insertions(+)
diff -Nru a/net/ipv4/netfilter/ip_nat_ftp.c b/net/ipv4/netfilter/ip_nat_ftp.c
--- a/net/ipv4/netfilter/ip_nat_ftp.c 2005-03-30 20:06:38 -08:00
+++ b/net/ipv4/netfilter/ip_nat_ftp.c 2005-03-30 20:06:38 -08:00
@@ -170,5 +170,14 @@
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 -Nru a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c
--- a/net/ipv4/netfilter/ip_nat_irc.c 2005-03-30 20:06:38 -08:00
+++ b/net/ipv4/netfilter/ip_nat_irc.c 2005-03-30 20:06:38 -08:00
@@ -112,5 +112,14 @@
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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
