projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
net
/
netfilter
/
xt_mac.c
diff --git
a/net/netfilter/xt_mac.c
b/net/netfilter/xt_mac.c
index
e207726
..
356290f
100644
(file)
--- a/
net/netfilter/xt_mac.c
+++ b/
net/netfilter/xt_mac.c
@@
-27,6
+27,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,
@@
-48,6
+49,7
@@
static struct xt_match mac_match = {
.matchsize = sizeof(struct xt_mac_info),
.hooks = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) |
(1 << NF_IP_FORWARD),
.matchsize = sizeof(struct xt_mac_info),
.hooks = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) |
(1 << NF_IP_FORWARD),
+ .family = AF_INET,
.me = THIS_MODULE,
};
static struct xt_match mac6_match = {
.me = THIS_MODULE,
};
static struct xt_match mac6_match = {
@@
-56,28
+58,29
@@
static struct xt_match mac6_match = {
.matchsize = sizeof(struct xt_mac_info),
.hooks = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) |
(1 << NF_IP_FORWARD),
.matchsize = sizeof(struct xt_mac_info),
.hooks = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) |
(1 << NF_IP_FORWARD),
+ .family = AF_INET6,
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
xt_mac_
init(void)
{
int ret;
{
int ret;
- ret = xt_register_match(
AF_INET,
&mac_match);
+ ret = xt_register_match(&mac_match);
if (ret)
return ret;
if (ret)
return ret;
- ret = xt_register_match(
AF_INET6,
&mac6_match);
+ ret = xt_register_match(&mac6_match);
if (ret)
if (ret)
- xt_unregister_match(
AF_INET,
&mac_match);
+ xt_unregister_match(&mac_match);
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
xt_mac_
fini(void)
{
{
- xt_unregister_match(
AF_INET,
&mac_match);
- xt_unregister_match(
AF_INET6,
&mac6_match);
+ xt_unregister_match(&mac_match);
+ xt_unregister_match(&mac6_match);
}
}
-module_init(init);
-module_exit(fini);
+module_init(
xt_mac_
init);
+module_exit(
xt_mac_
fini);