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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
bridge
/
netfilter
/
ebt_vlan.c
diff --git
a/net/bridge/netfilter/ebt_vlan.c
b/net/bridge/netfilter/ebt_vlan.c
index
db60d73
..
a2b4528
100644
(file)
--- a/
net/bridge/netfilter/ebt_vlan.c
+++ b/
net/bridge/netfilter/ebt_vlan.c
@@
-178,7
+178,7
@@
static struct ebt_match filter_vlan = {
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_vlan_
init(void)
{
DEBUG_MSG("ebtables 802.1Q extension module v"
MODULE_VERS "\n");
{
DEBUG_MSG("ebtables 802.1Q extension module v"
MODULE_VERS "\n");
@@
-186,10
+186,10
@@
static int __init init(void)
return ebt_register_match(&filter_vlan);
}
return ebt_register_match(&filter_vlan);
}
-static void __exit fini(void)
+static void __exit
ebt_vlan_
fini(void)
{
ebt_unregister_match(&filter_vlan);
}
{
ebt_unregister_match(&filter_vlan);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_vlan_
init);
+module_exit(
ebt_vlan_
fini);