Jan Engelhardt wrote:
commit bf161deb157ce95ac28b534a86fc1b18fe4d9aa4
Author: Jan Engelhardt <jengelh@xxxxxxxxxx>
Date: Sun Aug 10 22:16:14 2008 -0400
[NETFILTER]: Make Ebtables use Xtables infrastructure
> ...
> 22 files changed, 620 insertions(+), 593 deletions(-)
Nice work, thanks. The patch is really huge though and I would
prefer a slightly more gradual conversion, like first adjust
the return conventions (and only those), than convert to x_tables.
+MODULE_AUTHOR("Manohar Castelino <manohar.r.castelino@xxxxxxxxx>");
+MODULE_AUTHOR("Kuo-Lang Tseng <kuo-lang.tseng@xxxxxxxxx>");
+MODULE_AUTHOR("Jan Engelhardt <jengelh@xxxxxxxxxx>");
Please avoid these unrelated changes, especially in big patches
like this that are supposed to contain only mechanical transformations.
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index aece6c2..f03ced4 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -30,7 +30,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@xxxxxxxxxxxxx>");
-MODULE_DESCRIPTION("[ip,ip6,arp]_tables backend module");
+MODULE_DESCRIPTION("{ip,ip6,arp,eb}_tables backend module");
#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))
@@ -325,7 +325,8 @@ int xt_check_match(const struct xt_match *match, unsigned short family,
unsigned int size, const char *table, unsigned int hook_mask,
unsigned short proto, int inv_proto)
{
- if (XT_ALIGN(match->matchsize) != size) {
+ /* testing for -1 is temporary until ebtables is fixed up */
+ if (match->matchsize != -1 && XT_ALIGN(match->matchsize) != size) {
What exactly is the problem here (and when will ebtables be fixed up)?
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html