projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull acpi_device_handle_cleanup into release branch
[powerpc.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_netbios_ns.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
index
186646e
..
a566a81
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_netbios_ns.c
+++ b/
net/ipv4/netfilter/ip_conntrack_netbios_ns.c
@@
-37,7
+37,7
@@
MODULE_DESCRIPTION("NetBIOS name service broadcast connection tracking helper");
MODULE_LICENSE("GPL");
static unsigned int timeout = 3;
MODULE_LICENSE("GPL");
static unsigned int timeout = 3;
-module_param(timeout,
int, 06
00);
+module_param(timeout,
uint, 04
00);
MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");
static int help(struct sk_buff **pskb,
MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");
static int help(struct sk_buff **pskb,
@@
-127,16
+127,16
@@
static struct ip_conntrack_helper helper = {
.help = help,
};
.help = help,
};
-static int __init init(void)
+static int __init i
p_conntrack_netbios_ns_i
nit(void)
{
helper.timeout = timeout;
return ip_conntrack_helper_register(&helper);
}
{
helper.timeout = timeout;
return ip_conntrack_helper_register(&helper);
}
-static void __exit fini(void)
+static void __exit
ip_conntrack_netbios_ns_
fini(void)
{
ip_conntrack_helper_unregister(&helper);
}
{
ip_conntrack_helper_unregister(&helper);
}
-module_init(init);
-module_exit(fini);
+module_init(i
p_conntrack_netbios_ns_i
nit);
+module_exit(
ip_conntrack_netbios_ns_
fini);