git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[BRIDGE]: Annotations.
[sfrench/cifs-2.6.git]
/
net
/
bridge
/
netfilter
/
ebt_ip.c
diff --git
a/net/bridge/netfilter/ebt_ip.c
b/net/bridge/netfilter/ebt_ip.c
index f158fe67dd605fd8ca3dd5b941df04147d0d277f..e4c642448e1b41e403d0bab85b98c59b85b46d29 100644
(file)
--- a/
net/bridge/netfilter/ebt_ip.c
+++ b/
net/bridge/netfilter/ebt_ip.c
@@
-20,8
+20,8
@@
#include <linux/module.h>
struct tcpudphdr {
#include <linux/module.h>
struct tcpudphdr {
-
uint16_t
src;
-
uint16_t
dst;
+
__be16
src;
+
__be16
dst;
};
static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in,
};
static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in,
@@
-92,7
+92,9
@@
static int ebt_ip_check(const char *tablename, unsigned int hookmask,
if (info->invflags & EBT_IP_PROTO)
return -EINVAL;
if (info->protocol != IPPROTO_TCP &&
if (info->invflags & EBT_IP_PROTO)
return -EINVAL;
if (info->protocol != IPPROTO_TCP &&
- info->protocol != IPPROTO_UDP)
+ info->protocol != IPPROTO_UDP &&
+ info->protocol != IPPROTO_SCTP &&
+ info->protocol != IPPROTO_DCCP)
return -EINVAL;
}
if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1])
return -EINVAL;
}
if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1])
@@
-110,16
+112,16
@@
static struct ebt_match filter_ip =
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_ip_
init(void)
{
return ebt_register_match(&filter_ip);
}
{
return ebt_register_match(&filter_ip);
}
-static void __exit fini(void)
+static void __exit
ebt_ip_
fini(void)
{
ebt_unregister_match(&filter_ip);
}
{
ebt_unregister_match(&filter_ip);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_ip_
init);
+module_exit(
ebt_ip_
fini);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");