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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
bridge
/
netfilter
/
ebt_arp.c
diff --git
a/net/bridge/netfilter/ebt_arp.c
b/net/bridge/netfilter/ebt_arp.c
index
b94c48c
..
9c59980
100644
(file)
--- a/
net/bridge/netfilter/ebt_arp.c
+++ b/
net/bridge/netfilter/ebt_arp.c
@@
-35,10
+35,10
@@
static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in
return EBT_NOMATCH;
if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP)) {
return EBT_NOMATCH;
if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP)) {
-
uint32_t
_addr, *ap;
+
__be32
_addr, *ap;
/* IPv4 addresses are always 4 bytes */
/* IPv4 addresses are always 4 bytes */
- if (ah->ar_pln != sizeof(
uint32_t
))
+ if (ah->ar_pln != sizeof(
__be32
))
return EBT_NOMATCH;
if (info->bitmask & EBT_ARP_SRC_IP) {
ap = skb_header_pointer(skb, sizeof(struct arphdr) +
return EBT_NOMATCH;
if (info->bitmask & EBT_ARP_SRC_IP) {
ap = skb_header_pointer(skb, sizeof(struct arphdr) +
@@
-53,7
+53,7
@@
static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in
if (info->bitmask & EBT_ARP_DST_IP) {
ap = skb_header_pointer(skb, sizeof(struct arphdr) +
if (info->bitmask & EBT_ARP_DST_IP) {
ap = skb_header_pointer(skb, sizeof(struct arphdr) +
- 2*ah->ar_hln+sizeof(
uint32_t
),
+ 2*ah->ar_hln+sizeof(
__be32
),
sizeof(_addr), &_addr);
if (ap == NULL)
return EBT_NOMATCH;
sizeof(_addr), &_addr);
if (ap == NULL)
return EBT_NOMATCH;
@@
-125,16
+125,16
@@
static struct ebt_match filter_arp =
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_arp_
init(void)
{
return ebt_register_match(&filter_arp);
}
{
return ebt_register_match(&filter_arp);
}
-static void __exit fini(void)
+static void __exit
ebt_arp_
fini(void)
{
ebt_unregister_match(&filter_arp);
}
{
ebt_unregister_match(&filter_arp);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_arp_
init);
+module_exit(
ebt_arp_
fini);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");