diff options
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ip6.c | 2 | ||||
-rw-r--r-- | net/netfilter/xt_TCPOPTSTRIP.c | 3 | ||||
-rw-r--r-- | net/netfilter/xt_connlimit.c | 1 | ||||
-rw-r--r-- | net/netfilter/xt_connmark.c | 2 | ||||
-rw-r--r-- | net/netfilter/xt_hashlimit.c | 2 | ||||
-rw-r--r-- | net/netfilter/xt_recent.c | 2 | ||||
-rw-r--r-- | net/netfilter/xt_time.c | 3 | ||||
-rw-r--r-- | net/netfilter/xt_u32.c | 3 |
9 files changed, 8 insertions, 12 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 8843fef0fced..fa327f673a32 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -247,7 +247,7 @@ What (Why): | |||
247 | 247 | ||
248 | When: January 2009 or Linux 2.7.0, whichever comes first | 248 | When: January 2009 or Linux 2.7.0, whichever comes first |
249 | Why: Superseded by newer revisions or modules | 249 | Why: Superseded by newer revisions or modules |
250 | Who: Jan Engelhardt <jengelh@computergmbh.de> | 250 | Who: Jan Engelhardt <jengelh@medozas.de> |
251 | 251 | ||
252 | --------------------------- | 252 | --------------------------- |
253 | 253 | ||
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c index bbf2534ef026..4cb60f1ae7ad 100644 --- a/net/bridge/netfilter/ebt_ip6.c +++ b/net/bridge/netfilter/ebt_ip6.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Authors: | 4 | * Authors: |
5 | * Manohar Castelino <manohar.r.castelino@intel.com> | 5 | * Manohar Castelino <manohar.r.castelino@intel.com> |
6 | * Kuo-Lang Tseng <kuo-lang.tseng@intel.com> | 6 | * Kuo-Lang Tseng <kuo-lang.tseng@intel.com> |
7 | * Jan Engelhardt <jengelh@computergmbh.de> | 7 | * Jan Engelhardt <jengelh@medozas.de> |
8 | * | 8 | * |
9 | * Summary: | 9 | * Summary: |
10 | * This is just a modification of the IPv4 code written by | 10 | * This is just a modification of the IPv4 code written by |
diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c index 9dd8c8ef63eb..e8b57609ddc0 100644 --- a/net/netfilter/xt_TCPOPTSTRIP.c +++ b/net/netfilter/xt_TCPOPTSTRIP.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2007 Sven Schnelle <svens@bitebene.org> | 4 | * Copyright (C) 2007 Sven Schnelle <svens@bitebene.org> |
5 | * Copyright © CC Computer Consultants GmbH, 2007 | 5 | * Copyright © CC Computer Consultants GmbH, 2007 |
6 | * Contact: Jan Engelhardt <jengelh@computergmbh.de> | ||
7 | * | 6 | * |
8 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
@@ -136,7 +135,7 @@ static void __exit tcpoptstrip_tg_exit(void) | |||
136 | 135 | ||
137 | module_init(tcpoptstrip_tg_init); | 136 | module_init(tcpoptstrip_tg_init); |
138 | module_exit(tcpoptstrip_tg_exit); | 137 | module_exit(tcpoptstrip_tg_exit); |
139 | MODULE_AUTHOR("Sven Schnelle <svens@bitebene.org>, Jan Engelhardt <jengelh@computergmbh.de>"); | 138 | MODULE_AUTHOR("Sven Schnelle <svens@bitebene.org>, Jan Engelhardt <jengelh@medozas.de>"); |
140 | MODULE_DESCRIPTION("Xtables: TCP option stripping"); | 139 | MODULE_DESCRIPTION("Xtables: TCP option stripping"); |
141 | MODULE_LICENSE("GPL"); | 140 | MODULE_LICENSE("GPL"); |
142 | MODULE_ALIAS("ipt_TCPOPTSTRIP"); | 141 | MODULE_ALIAS("ipt_TCPOPTSTRIP"); |
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index 26997ce90e48..9e624af40f80 100644 --- a/net/netfilter/xt_connlimit.c +++ b/net/netfilter/xt_connlimit.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * Nov 2002: Martin Bene <martin.bene@icomedias.com>: | 5 | * Nov 2002: Martin Bene <martin.bene@icomedias.com>: |
6 | * only ignore TIME_WAIT or gone connections | 6 | * only ignore TIME_WAIT or gone connections |
7 | * (C) CC Computer Consultants GmbH, 2007 | 7 | * (C) CC Computer Consultants GmbH, 2007 |
8 | * Contact: <jengelh@computergmbh.de> | ||
9 | * | 8 | * |
10 | * based on ... | 9 | * based on ... |
11 | * | 10 | * |
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c index d184515604b6..97465a472344 100644 --- a/net/netfilter/xt_connmark.c +++ b/net/netfilter/xt_connmark.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com> | 4 | * Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com> |
5 | * by Henrik Nordstrom <hno@marasystems.com> | 5 | * by Henrik Nordstrom <hno@marasystems.com> |
6 | * Copyright © CC Computer Consultants GmbH, 2007 - 2008 | 6 | * Copyright © CC Computer Consultants GmbH, 2007 - 2008 |
7 | * Jan Engelhardt <jengelh@computergmbh.de> | 7 | * Jan Engelhardt <jengelh@medozas.de> |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 9e9c48963942..ba9601a767aa 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | MODULE_LICENSE("GPL"); | 37 | MODULE_LICENSE("GPL"); |
38 | MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>"); | 38 | MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>"); |
39 | MODULE_AUTHOR("Jan Engelhardt <jengelh@computergmbh.de>"); | 39 | MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>"); |
40 | MODULE_DESCRIPTION("Xtables: per hash-bucket rate-limit match"); | 40 | MODULE_DESCRIPTION("Xtables: per hash-bucket rate-limit match"); |
41 | MODULE_ALIAS("ipt_hashlimit"); | 41 | MODULE_ALIAS("ipt_hashlimit"); |
42 | MODULE_ALIAS("ip6t_hashlimit"); | 42 | MODULE_ALIAS("ip6t_hashlimit"); |
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c index 7073dbb8100c..1af74dd563d5 100644 --- a/net/netfilter/xt_recent.c +++ b/net/netfilter/xt_recent.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/netfilter/xt_recent.h> | 34 | #include <linux/netfilter/xt_recent.h> |
35 | 35 | ||
36 | MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>"); | 36 | MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>"); |
37 | MODULE_AUTHOR("Jan Engelhardt <jengelh@computergmbh.de>"); | 37 | MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>"); |
38 | MODULE_DESCRIPTION("Xtables: \"recently-seen\" host matching for IPv4"); | 38 | MODULE_DESCRIPTION("Xtables: \"recently-seen\" host matching for IPv4"); |
39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
40 | MODULE_ALIAS("ipt_recent"); | 40 | MODULE_ALIAS("ipt_recent"); |
diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c index 93acaa59d108..9a9c9a3b0a5d 100644 --- a/net/netfilter/xt_time.c +++ b/net/netfilter/xt_time.c | |||
@@ -1,7 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * xt_time | 2 | * xt_time |
3 | * Copyright © CC Computer Consultants GmbH, 2007 | 3 | * Copyright © CC Computer Consultants GmbH, 2007 |
4 | * Contact: <jengelh@computergmbh.de> | ||
5 | * | 4 | * |
6 | * based on ipt_time by Fabrice MARIE <fabrice@netfilter.org> | 5 | * based on ipt_time by Fabrice MARIE <fabrice@netfilter.org> |
7 | * This is a module which is used for time matching | 6 | * This is a module which is used for time matching |
@@ -264,7 +263,7 @@ static void __exit time_mt_exit(void) | |||
264 | 263 | ||
265 | module_init(time_mt_init); | 264 | module_init(time_mt_init); |
266 | module_exit(time_mt_exit); | 265 | module_exit(time_mt_exit); |
267 | MODULE_AUTHOR("Jan Engelhardt <jengelh@computergmbh.de>"); | 266 | MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>"); |
268 | MODULE_DESCRIPTION("Xtables: time-based matching"); | 267 | MODULE_DESCRIPTION("Xtables: time-based matching"); |
269 | MODULE_LICENSE("GPL"); | 268 | MODULE_LICENSE("GPL"); |
270 | MODULE_ALIAS("ipt_time"); | 269 | MODULE_ALIAS("ipt_time"); |
diff --git a/net/netfilter/xt_u32.c b/net/netfilter/xt_u32.c index 24a527624500..d7c05f03a7e7 100644 --- a/net/netfilter/xt_u32.c +++ b/net/netfilter/xt_u32.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * | 3 | * |
4 | * Original author: Don Cohen <don@isis.cs3-inc.com> | 4 | * Original author: Don Cohen <don@isis.cs3-inc.com> |
5 | * (C) CC Computer Consultants GmbH, 2007 | 5 | * (C) CC Computer Consultants GmbH, 2007 |
6 | * Contact: <jengelh@computergmbh.de> | ||
7 | */ | 6 | */ |
8 | 7 | ||
9 | #include <linux/module.h> | 8 | #include <linux/module.h> |
@@ -117,7 +116,7 @@ static void __exit u32_mt_exit(void) | |||
117 | 116 | ||
118 | module_init(u32_mt_init); | 117 | module_init(u32_mt_init); |
119 | module_exit(u32_mt_exit); | 118 | module_exit(u32_mt_exit); |
120 | MODULE_AUTHOR("Jan Engelhardt <jengelh@computergmbh.de>"); | 119 | MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>"); |
121 | MODULE_DESCRIPTION("Xtables: arbitrary byte matching"); | 120 | MODULE_DESCRIPTION("Xtables: arbitrary byte matching"); |
122 | MODULE_LICENSE("GPL"); | 121 | MODULE_LICENSE("GPL"); |
123 | MODULE_ALIAS("ipt_u32"); | 122 | MODULE_ALIAS("ipt_u32"); |