projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
net
/
ipv6
/
netfilter
/
ip6t_ah.c
diff --git
a/net/ipv6/netfilter/ip6t_ah.c
b/net/ipv6/netfilter/ip6t_ah.c
index
268918d
..
ec1b160
100644
(file)
--- a/
net/ipv6/netfilter/ip6t_ah.c
+++ b/
net/ipv6/netfilter/ip6t_ah.c
@@
-44,6
+44,7
@@
static int
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
+ const struct xt_match *match,
const void *matchinfo,
int offset,
unsigned int protoff,
const void *matchinfo,
int offset,
unsigned int protoff,
@@
-54,7
+55,7
@@
match(const struct sk_buff *skb,
unsigned int ptr;
unsigned int hdrlen = 0;
unsigned int ptr;
unsigned int hdrlen = 0;
- if (ipv6_find_hdr(skb, &ptr, NEXTHDR_AUTH) < 0)
+ if (ipv6_find_hdr(skb, &ptr, NEXTHDR_AUTH
, NULL
) < 0)
return 0;
ah = skb_header_pointer(skb, ptr, sizeof(_ah), &_ah);
return 0;
ah = skb_header_pointer(skb, ptr, sizeof(_ah), &_ah);
@@
-98,18
+99,13
@@
match(const struct sk_buff *skb,
/* Called when user tries to insert an entry of this type. */
static int
checkentry(const char *tablename,
/* Called when user tries to insert an entry of this type. */
static int
checkentry(const char *tablename,
- const struct ip6t_ip6 *ip,
+ const void *entry,
+ const struct xt_match *match,
void *matchinfo,
void *matchinfo,
- unsigned int matchinfosize,
unsigned int hook_mask)
{
const struct ip6t_ah *ahinfo = matchinfo;
unsigned int hook_mask)
{
const struct ip6t_ah *ahinfo = matchinfo;
- if (matchinfosize != IP6T_ALIGN(sizeof(struct ip6t_ah))) {
- DEBUGP("ip6t_ah: matchsize %u != %u\n",
- matchinfosize, IP6T_ALIGN(sizeof(struct ip6t_ah)));
- return 0;
- }
if (ahinfo->invflags & ~IP6T_AH_INV_MASK) {
DEBUGP("ip6t_ah: unknown flags %X\n", ahinfo->invflags);
return 0;
if (ahinfo->invflags & ~IP6T_AH_INV_MASK) {
DEBUGP("ip6t_ah: unknown flags %X\n", ahinfo->invflags);
return 0;
@@
-119,20
+115,21
@@
checkentry(const char *tablename,
static struct ip6t_match ah_match = {
.name = "ah",
static struct ip6t_match ah_match = {
.name = "ah",
- .match = &match,
- .checkentry = &checkentry,
+ .match = match,
+ .matchsize = sizeof(struct ip6t_ah),
+ .checkentry = checkentry,
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init i
p6t_ah_i
nit(void)
{
return ip6t_register_match(&ah_match);
}
{
return ip6t_register_match(&ah_match);
}
-static void __exit
cleanup
(void)
+static void __exit
ip6t_ah_fini
(void)
{
ip6t_unregister_match(&ah_match);
}
{
ip6t_unregister_match(&ah_match);
}
-module_init(init);
-module_exit(
cleanup
);
+module_init(i
p6t_ah_i
nit);
+module_exit(
ip6t_ah_fini
);