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_stp.c
diff --git
a/net/bridge/netfilter/ebt_stp.c
b/net/bridge/netfilter/ebt_stp.c
index
f8a8cde
..
a0bed82
100644
(file)
--- a/
net/bridge/netfilter/ebt_stp.c
+++ b/
net/bridge/netfilter/ebt_stp.c
@@
-10,6
+10,7
@@
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_stp.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter_bridge/ebt_stp.h>
+#include <linux/etherdevice.h>
#include <linux/module.h>
#define BPDU_TYPE_CONFIG 0
#include <linux/module.h>
#define BPDU_TYPE_CONFIG 0
@@
-164,8
+165,8
@@
static int ebt_stp_check(const char *tablename, unsigned int hookmask,
if (datalen != len)
return -EINVAL;
/* Make sure the match only receives stp frames */
if (datalen != len)
return -EINVAL;
/* Make sure the match only receives stp frames */
- if (
memcmp(e->destmac, bridge_ula, ETH_ALEN
) ||
-
memcmp(e->destmsk, msk, ETH_ALEN
) || !(e->bitmask & EBT_DESTMAC))
+ if (
compare_ether_addr(e->destmac, bridge_ula
) ||
+
compare_ether_addr(e->destmsk, msk
) || !(e->bitmask & EBT_DESTMAC))
return -EINVAL;
return 0;
return -EINVAL;
return 0;
@@
-179,16
+180,16
@@
static struct ebt_match filter_stp =
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_stp_
init(void)
{
return ebt_register_match(&filter_stp);
}
{
return ebt_register_match(&filter_stp);
}
-static void __exit fini(void)
+static void __exit
ebt_stp_
fini(void)
{
ebt_unregister_match(&filter_stp);
}
{
ebt_unregister_match(&filter_stp);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_stp_
init);
+module_exit(
ebt_stp_
fini);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");