From 298f16a53eb09061ae79c48249ad8e3db3709d52 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@computergmbh.de>
Date: Thu, 11 Oct 2007 14:36:40 -0700
Subject: [PATCH] --- yaml --- r: 67073 b: refs/heads/master c:
 73aaf9355b71d295fd72dc0b93fcdd275c56648f h: refs/heads/master i:   67071:
 b1e4fa7a52ca17fd29b2f01631c0da1c03f0e270 v: v3

---
 [refs]                             | 2 +-
 trunk/net/netfilter/xt_CLASSIFY.c  | 1 +
 trunk/net/netfilter/xt_CONNMARK.c  | 1 +
 trunk/net/netfilter/xt_NOTRACK.c   | 1 +
 trunk/net/netfilter/xt_connbytes.c | 1 +
 trunk/net/netfilter/xt_connmark.c  | 1 +
 trunk/net/netfilter/xt_dccp.c      | 1 +
 trunk/net/netfilter/xt_sctp.c      | 1 +
 trunk/net/netfilter/xt_tcpmss.c    | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0b9d1a017898..64a1564ec501 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17311393f969090ab060540bd9dbe7dc885a76d5
+refs/heads/master: 73aaf9355b71d295fd72dc0b93fcdd275c56648f
diff --git a/trunk/net/netfilter/xt_CLASSIFY.c b/trunk/net/netfilter/xt_CLASSIFY.c
index 519428566829..07a1b9665005 100644
--- a/trunk/net/netfilter/xt_CLASSIFY.c
+++ b/trunk/net/netfilter/xt_CLASSIFY.c
@@ -24,6 +24,7 @@ MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("iptables qdisc classification target module");
 MODULE_ALIAS("ipt_CLASSIFY");
+MODULE_ALIAS("ip6t_CLASSIFY");
 
 static unsigned int
 target(struct sk_buff **pskb,
diff --git a/trunk/net/netfilter/xt_CONNMARK.c b/trunk/net/netfilter/xt_CONNMARK.c
index 5a00c5444334..7043c2757e09 100644
--- a/trunk/net/netfilter/xt_CONNMARK.c
+++ b/trunk/net/netfilter/xt_CONNMARK.c
@@ -27,6 +27,7 @@ MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
 MODULE_DESCRIPTION("IP tables CONNMARK matching module");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_CONNMARK");
+MODULE_ALIAS("ip6t_CONNMARK");
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_CONNMARK.h>
diff --git a/trunk/net/netfilter/xt_NOTRACK.c b/trunk/net/netfilter/xt_NOTRACK.c
index b7d6312fccc7..fec1aefb1c32 100644
--- a/trunk/net/netfilter/xt_NOTRACK.c
+++ b/trunk/net/netfilter/xt_NOTRACK.c
@@ -9,6 +9,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_NOTRACK");
+MODULE_ALIAS("ip6t_NOTRACK");
 
 static unsigned int
 target(struct sk_buff **pskb,
diff --git a/trunk/net/netfilter/xt_connbytes.c b/trunk/net/netfilter/xt_connbytes.c
index dd4d79b8fc9d..af79423bc8e8 100644
--- a/trunk/net/netfilter/xt_connbytes.c
+++ b/trunk/net/netfilter/xt_connbytes.c
@@ -14,6 +14,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("iptables match for matching number of pkts/bytes per connection");
 MODULE_ALIAS("ipt_connbytes");
+MODULE_ALIAS("ip6t_connbytes");
 
 static bool
 match(const struct sk_buff *skb,
diff --git a/trunk/net/netfilter/xt_connmark.c b/trunk/net/netfilter/xt_connmark.c
index e73fa9b46cf7..1071fc54d6d3 100644
--- a/trunk/net/netfilter/xt_connmark.c
+++ b/trunk/net/netfilter/xt_connmark.c
@@ -29,6 +29,7 @@ MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
 MODULE_DESCRIPTION("IP tables connmark match module");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_connmark");
+MODULE_ALIAS("ip6t_connmark");
 
 static bool
 match(const struct sk_buff *skb,
diff --git a/trunk/net/netfilter/xt_dccp.c b/trunk/net/netfilter/xt_dccp.c
index 83224ec89cc0..c2b1b24ee335 100644
--- a/trunk/net/netfilter/xt_dccp.c
+++ b/trunk/net/netfilter/xt_dccp.c
@@ -24,6 +24,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("Match for DCCP protocol packets");
 MODULE_ALIAS("ipt_dccp");
+MODULE_ALIAS("ip6t_dccp");
 
 #define DCCHECK(cond, option, flag, invflag) (!((flag) & (option)) \
 				  || (!!((invflag) & (option)) ^ (cond)))
diff --git a/trunk/net/netfilter/xt_sctp.c b/trunk/net/netfilter/xt_sctp.c
index c002153b80ab..f907770fd4e9 100644
--- a/trunk/net/netfilter/xt_sctp.c
+++ b/trunk/net/netfilter/xt_sctp.c
@@ -13,6 +13,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kiran Kumar Immidi");
 MODULE_DESCRIPTION("Match for SCTP protocol packets");
 MODULE_ALIAS("ipt_sctp");
+MODULE_ALIAS("ip6t_sctp");
 
 #ifdef DEBUG_SCTP
 #define duprintf(format, args...) printk(format , ## args)
diff --git a/trunk/net/netfilter/xt_tcpmss.c b/trunk/net/netfilter/xt_tcpmss.c
index cd5f6d758c68..84d401bfafad 100644
--- a/trunk/net/netfilter/xt_tcpmss.c
+++ b/trunk/net/netfilter/xt_tcpmss.c
@@ -22,6 +22,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
 MODULE_DESCRIPTION("iptables TCP MSS match module");
 MODULE_ALIAS("ipt_tcpmss");
+MODULE_ALIAS("ip6t_tcpmss");
 
 static bool
 match(const struct sk_buff *skb,