git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_irc.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_irc.c
b/net/ipv4/netfilter/ip_conntrack_irc.c
index
4488907
..
c51a2cf
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/
net/ipv4/netfilter/ip_conntrack_irc.c
@@
-22,6
+22,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/netfilter.h>
#include <linux/ip.h>
#include <linux/module.h>
#include <linux/netfilter.h>
#include <linux/ip.h>
@@
-241,9
+242,9
@@
static int help(struct sk_buff **pskb,
static struct ip_conntrack_helper irc_helpers[MAX_PORTS];
static char irc_names[MAX_PORTS][sizeof("irc-65535")];
static struct ip_conntrack_helper irc_helpers[MAX_PORTS];
static char irc_names[MAX_PORTS][sizeof("irc-65535")];
-static void
ip_conntrack_irc_
fini(void);
+static void fini(void);
-static int __init i
p_conntrack_irc_i
nit(void)
+static int __init init(void)
{
int i, ret;
struct ip_conntrack_helper *hlpr;
{
int i, ret;
struct ip_conntrack_helper *hlpr;
@@
-287,7
+288,7
@@
static int __init ip_conntrack_irc_init(void)
if (ret) {
printk("ip_conntrack_irc: ERROR registering port %d\n",
ports[i]);
if (ret) {
printk("ip_conntrack_irc: ERROR registering port %d\n",
ports[i]);
-
ip_conntrack_irc_
fini();
+ fini();
return -EBUSY;
}
}
return -EBUSY;
}
}
@@
-296,7
+297,7
@@
static int __init ip_conntrack_irc_init(void)
/* This function is intentionally _NOT_ defined as __exit, because
* it is needed by the init function */
/* This function is intentionally _NOT_ defined as __exit, because
* it is needed by the init function */
-static void
ip_conntrack_irc_
fini(void)
+static void fini(void)
{
int i;
for (i = 0; i < ports_c; i++) {
{
int i;
for (i = 0; i < ports_c; i++) {
@@
-307,5
+308,5
@@
static void ip_conntrack_irc_fini(void)
kfree(irc_buffer);
}
kfree(irc_buffer);
}
-module_init(i
p_conntrack_irc_i
nit);
-module_exit(
ip_conntrack_irc_
fini);
+module_init(init);
+module_exit(fini);