diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-12-19 09:08:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-19 22:27:29 -0500 |
commit | eb93992207dadb946a3b5cf4544957dc924a6f58 (patch) | |
tree | 8d840ea0e0e5eb3cf6207a2608d434475a9076b4 /net/ipv4 | |
parent | 3db1cd5c05f35fb43eb134df6f321de4e63141f2 (diff) |
module_param: make bool parameters really bool (net & drivers/net)
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.
It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.
(Thanks to Joe Perches for suggesting coccinelle for 0/1 -> true/false).
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ipt_ULOG.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/iptable_filter.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c index b5508151e547..ba5756d20165 100644 --- a/net/ipv4/netfilter/ipt_ULOG.c +++ b/net/ipv4/netfilter/ipt_ULOG.c | |||
@@ -65,7 +65,7 @@ static unsigned int flushtimeout = 10; | |||
65 | module_param(flushtimeout, uint, 0600); | 65 | module_param(flushtimeout, uint, 0600); |
66 | MODULE_PARM_DESC(flushtimeout, "buffer flush timeout (hundredths of a second)"); | 66 | MODULE_PARM_DESC(flushtimeout, "buffer flush timeout (hundredths of a second)"); |
67 | 67 | ||
68 | static int nflog = 1; | 68 | static bool nflog = true; |
69 | module_param(nflog, bool, 0400); | 69 | module_param(nflog, bool, 0400); |
70 | MODULE_PARM_DESC(nflog, "register as internal netfilter logging module"); | 70 | MODULE_PARM_DESC(nflog, "register as internal netfilter logging module"); |
71 | 71 | ||
diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c index c37641e819f2..0e58f09e59fb 100644 --- a/net/ipv4/netfilter/iptable_filter.c +++ b/net/ipv4/netfilter/iptable_filter.c | |||
@@ -52,7 +52,7 @@ iptable_filter_hook(unsigned int hook, struct sk_buff *skb, | |||
52 | static struct nf_hook_ops *filter_ops __read_mostly; | 52 | static struct nf_hook_ops *filter_ops __read_mostly; |
53 | 53 | ||
54 | /* Default to forward because I got too much mail already. */ | 54 | /* Default to forward because I got too much mail already. */ |
55 | static int forward = NF_ACCEPT; | 55 | static bool forward = NF_ACCEPT; |
56 | module_param(forward, bool, 0000); | 56 | module_param(forward, bool, 0000); |
57 | 57 | ||
58 | static int __net_init iptable_filter_net_init(struct net *net) | 58 | static int __net_init iptable_filter_net_init(struct net *net) |