From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 4 Mar 2005 14:01:37 +0000 (+0000)
Subject: - merge revision 1.3
X-Git-Tag: planetlab-3_0-rc13~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eeed43233bd1ac35335882cff3478c7651c6a4d0;p=linux-2.6.git

- merge revision 1.3
date: 2005/02/01 03:26:15;  author: mlhuang;  state: Exp;  lines: +0 -2
- remove deprecated code; no longer using nfmark to set xid
---

diff --git a/net/ipv4/netfilter/ipt_MARK.c b/net/ipv4/netfilter/ipt_MARK.c
index 0931c145b..06bcb8d55 100644
--- a/net/ipv4/netfilter/ipt_MARK.c
+++ b/net/ipv4/netfilter/ipt_MARK.c
@@ -50,12 +50,10 @@ checkentry(const char *tablename,
 		return 0;
 	}
 
-#if 0
 	if (strcmp(tablename, "mangle") != 0) {
 		printk(KERN_WARNING "MARK: can only be called from \"mangle\" table, not \"%s\"\n", tablename);
 		return 0;
 	}
-#endif
 
 	return 1;
 }