diff options
author | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
commit | 807b936bb3d9bb2c924c742a0548337089494968 (patch) | |
tree | 61198b487730ad1b434db66ec2f1e002b66d18c2 /src/main.c | |
parent | 0dbced3615ffdbb212ba4f791475a7c65a525309 (diff) | |
parent | bea7aab38f305bb8c2e400d575e6bd0a3c6bbc1f (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, segtree, all)\n" +" --debug <level [,level...]> Specify debugging level (scanner, parser, eval, netlink, mnl, proto-ctx, segtree, all)\n" #endif "\n", name); @@ -139,6 +139,10 @@ static const struct { .level = DEBUG_NETLINK, }, { + .name = "mnl", + .level = DEBUG_MNL, + }, + { .name = "proto-ctx", .level = DEBUG_PROTO_CTX, }, |