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 /include | |
| 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 'include')
| -rw-r--r-- | include/expression.h | 2 | ||||
| -rw-r--r-- | include/nftables.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/expression.h b/include/expression.h index a9aa328e..0633102e 100644 --- a/include/expression.h +++ b/include/expression.h @@ -27,7 +27,7 @@ * @EXPR_LIST: list of expressions * @EXPR_SET: literal set * @EXPR_SET_REF: set reference - * @EXPR_MAPPING: a single mapping (key => value) + * @EXPR_MAPPING: a single mapping (key : value) * @EXPR_MAP: map operation (expr map { EXPR_MAPPING, ... }) * @EXPR_UNARY: byteorder conversion, generated during evaluation * @EXPR_BINOP: binary operations (bitwise, shifts) diff --git a/include/nftables.h b/include/nftables.h index 225bf951..5a000870 100644 --- a/include/nftables.h +++ b/include/nftables.h @@ -17,8 +17,9 @@ enum debug_level { DEBUG_PARSER = 0x2, DEBUG_EVALUATION = 0x4, DEBUG_NETLINK = 0x8, - DEBUG_PROTO_CTX = 0x10, - DEBUG_SEGTREE = 0x20, + DEBUG_MNL = 0x10, + DEBUG_PROTO_CTX = 0x20, + DEBUG_SEGTREE = 0x40, }; #define INCLUDE_PATHS_MAX 16 |