summaryrefslogtreecommitdiffstats
path: root/net/ipv6/netfilter/ip6t_MARK.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-01 21:33:06 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-01 21:33:06 -0800
commitf98e85691bbbca1e72f8bfe9dfee2639e8545790 (patch)
tree0b7071e72c6b553dd7ccbed4906954c313ca7b61 /net/ipv6/netfilter/ip6t_MARK.c
parentec33b309101bb2904e9fe20252f7760e254d05ec (diff)
parent97300b5fdfe28c6edae926926f9467a27cf5889c (diff)
downloadop-kernel-dev-f98e85691bbbca1e72f8bfe9dfee2639e8545790.zip
op-kernel-dev-f98e85691bbbca1e72f8bfe9dfee2639e8545790.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/ipv6/netfilter/ip6t_MARK.c')
-rw-r--r--net/ipv6/netfilter/ip6t_MARK.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6t_MARK.c b/net/ipv6/netfilter/ip6t_MARK.c
index 81924fc..0c7584f 100644
--- a/net/ipv6/netfilter/ip6t_MARK.c
+++ b/net/ipv6/netfilter/ip6t_MARK.c
@@ -56,8 +56,12 @@ checkentry(const char *tablename,
return 1;
}
-static struct ip6t_target ip6t_mark_reg
-= { { NULL, NULL }, "MARK", target, checkentry, NULL, THIS_MODULE };
+static struct ip6t_target ip6t_mark_reg = {
+ .name = "MARK",
+ .target = target,
+ .checkentry = checkentry,
+ .me = THIS_MODULE
+};
static int __init init(void)
{
OpenPOWER on IntegriCloud