git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MTD] RBTX4939: add MTD support
[safe/jmp/linux-2.6]
/
net
/
ipv4
/
netfilter
/
arpt_mangle.c
diff --git
a/net/ipv4/netfilter/arpt_mangle.c
b/net/ipv4/netfilter/arpt_mangle.c
index
45fa4e2
..
b0d5b1d
100644
(file)
--- a/
net/ipv4/netfilter/arpt_mangle.c
+++ b/
net/ipv4/netfilter/arpt_mangle.c
@@
-9,17
+9,14
@@
MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
MODULE_DESCRIPTION("arptables arp payload mangle target");
static unsigned int
MODULE_DESCRIPTION("arptables arp payload mangle target");
static unsigned int
-target(struct sk_buff *skb,
- const struct net_device *in, const struct net_device *out,
- unsigned int hooknum, const struct xt_target *target,
- const void *targinfo)
+target(struct sk_buff *skb, const struct xt_target_param *par)
{
{
- const struct arpt_mangle *mangle = targinfo;
- struct arphdr *arp;
+ const struct arpt_mangle *mangle =
par->
targinfo;
+
const
struct arphdr *arp;
unsigned char *arpptr;
int pln, hln;
unsigned char *arpptr;
int pln, hln;
- if (skb_make_writable(skb, skb->len))
+ if (
!
skb_make_writable(skb, skb->len))
return NF_DROP;
arp = arp_hdr(skb);
return NF_DROP;
arp = arp_hdr(skb);
@@
-57,11
+54,9
@@
target(struct sk_buff *skb,
return mangle->target;
}
return mangle->target;
}
-static bool
-checkentry(const char *tablename, const void *e, const struct xt_target *target,
- void *targinfo, unsigned int hook_mask)
+static bool checkentry(const struct xt_tgchk_param *par)
{
{
- const struct arpt_mangle *mangle = targinfo;
+ const struct arpt_mangle *mangle =
par->
targinfo;
if (mangle->flags & ~ARPT_MANGLE_MASK ||
!(mangle->flags & ARPT_MANGLE_MASK))
if (mangle->flags & ~ARPT_MANGLE_MASK ||
!(mangle->flags & ARPT_MANGLE_MASK))
@@
-73,8
+68,9
@@
checkentry(const char *tablename, const void *e, const struct xt_target *target,
return true;
}
return true;
}
-static struct
arp
t_target arpt_mangle_reg __read_mostly = {
+static struct
x
t_target arpt_mangle_reg __read_mostly = {
.name = "mangle",
.name = "mangle",
+ .family = NFPROTO_ARP,
.target = target,
.targetsize = sizeof(struct arpt_mangle),
.checkentry = checkentry,
.target = target,
.targetsize = sizeof(struct arpt_mangle),
.checkentry = checkentry,
@@
-83,15
+79,12
@@
static struct arpt_target arpt_mangle_reg __read_mostly = {
static int __init arpt_mangle_init(void)
{
static int __init arpt_mangle_init(void)
{
- if (arpt_register_target(&arpt_mangle_reg))
- return -EINVAL;
-
- return 0;
+ return xt_register_target(&arpt_mangle_reg);
}
static void __exit arpt_mangle_fini(void)
{
}
static void __exit arpt_mangle_fini(void)
{
-
arp
t_unregister_target(&arpt_mangle_reg);
+
x
t_unregister_target(&arpt_mangle_reg);
}
module_init(arpt_mangle_init);
}
module_init(arpt_mangle_init);