projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
net
/
netfilter
/
xt_mac.c
diff --git
a/net/netfilter/xt_mac.c
b/net/netfilter/xt_mac.c
index
f4defa2
..
356290f
100644
(file)
--- a/
net/netfilter/xt_mac.c
+++ b/
net/netfilter/xt_mac.c
@@
-62,7
+62,7
@@
static struct xt_match mac6_match = {
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
xt_mac_
init(void)
{
int ret;
ret = xt_register_match(&mac_match);
{
int ret;
ret = xt_register_match(&mac_match);
@@
-76,11
+76,11
@@
static int __init init(void)
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
xt_mac_
fini(void)
{
xt_unregister_match(&mac_match);
xt_unregister_match(&mac6_match);
}
{
xt_unregister_match(&mac_match);
xt_unregister_match(&mac6_match);
}
-module_init(init);
-module_exit(fini);
+module_init(
xt_mac_
init);
+module_exit(
xt_mac_
fini);