From: Patrick McHardy <kaber@trash.net>
Date: Wed, 15 Jan 2014 15:45:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into next-3.14
X-Git-Tag: v0.2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d357cdd882cc0cf6afb15686834f5d9d6efab57f;p=thirdparty%2Fnftables.git

Merge remote-tracking branch 'origin/master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>

Conflicts:
	include/nftables.h
	src/main.c
---

d357cdd882cc0cf6afb15686834f5d9d6efab57f
diff --cc include/nftables.h
index 801000e1,f9891619..225bf951
--- a/include/nftables.h
+++ b/include/nftables.h
@@@ -17,7 -17,7 +17,8 @@@ enum debug_level 
  	DEBUG_PARSER		= 0x2,
  	DEBUG_EVALUATION	= 0x4,
  	DEBUG_NETLINK		= 0x8,
 -	DEBUG_SEGTREE		= 0x10,
 +	DEBUG_PROTO_CTX		= 0x10,
++	DEBUG_SEGTREE		= 0x20,
  };
  
  #define INCLUDE_PATHS_MAX	16
diff --cc src/main.c
index 14152398,d78eea79..c363fc88
--- a/src/main.c
+++ b/src/main.c
@@@ -111,7 -111,7 +111,7 @@@ static void show_help(const char *name
  "  -a/--handle			Output rule handle.\n"
  "  -I/--includepath <directory>	Add <directory> to the paths searched for include files.\n"
  #ifdef DEBUG
- "  --debug <level [,level...]>	Specify debugging level (scanner, parser, eval, netlink, proto-ctx, all)\n"
 -"  --debug <level [,level...]>	Specify debugging level (scanner, parser, eval, netlink, segtree, all)\n"
++"  --debug <level [,level...]>	Specify debugging level (scanner, parser, eval, netlink, proto-ctx, segtree, all)\n"
  #endif
  "\n",
  	name);
@@@ -138,10 -138,10 +138,14 @@@ static const struct 
  		.name		= "netlink",
  		.level		= DEBUG_NETLINK,
  	},
 +	{
 +		.name		= "proto-ctx",
 +		.level		= DEBUG_PROTO_CTX,
 +	},
+ 	{
+ 		.name		= "segtree",
+ 		.level		= DEBUG_SEGTREE,
+ 	},
  	{
  		.name		= "all",
  		.level		= ~0,