diff options
author | Patrick McHardy <kaber@trash.net> | 2014-01-15 15:45:02 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-01-15 15:45:02 +0000 |
commit | d357cdd882cc0cf6afb15686834f5d9d6efab57f (patch) | |
tree | 0c84af11c55111d8ee2d6185d5146ba637a87f58 /src/main.c | |
parent | 75d2e1e6e90b087ea48f0cf0ea23a8a566d94537 (diff) | |
parent | c3d233b1e210922ac6f29afca796b66964e499de (diff) |
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
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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, proto-ctx, segtree, all)\n" #endif "\n", name); @@ -143,6 +143,10 @@ static const struct { .level = DEBUG_PROTO_CTX, }, { + .name = "segtree", + .level = DEBUG_SEGTREE, + }, + { .name = "all", .level = ~0, }, |