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

diff --cc include/expression.h
Simple merge

diff --cc include/nftables.h
index 225bf951c89b7a5d2ff8d718f5abae324c971352,b36e10ae96976cdefe4bd499b1f1ec9ef2cbbbe2..5a0008705fe1f31a79c0c98ee2e6f577af26da5d
--- 1/include/nftables.h
--- 2/include/nftables.h
+++ b/include/nftables.h
@@@ -17,8 -17,8 +17,9 @@@ enum debug_level 
        DEBUG_PARSER            = 0x2,
        DEBUG_EVALUATION        = 0x4,
        DEBUG_NETLINK           = 0x8,
-       DEBUG_PROTO_CTX         = 0x10,
-       DEBUG_SEGTREE           = 0x20,
 -      DEBUG_SEGTREE           = 0x10,
 -      DEBUG_MNL               = 0x20,
++      DEBUG_MNL               = 0x10,
++      DEBUG_PROTO_CTX         = 0x20,
++      DEBUG_SEGTREE           = 0x40,
  };
  
  #define INCLUDE_PATHS_MAX     16

diff --cc src/evaluate.c
Simple merge

diff --cc src/main.c
index c363fc8850a8cd1a3cd6c3a872002a4a7b174c77,3f5dd04e3fe20737f76ef1d5648d902599d54fc0..28ce1aa613955e38a3ba9fbe042643e32bc8f9fd
--- 1/src/main.c
--- 2/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, segtree, all)\n"
 -"  --debug <level [,level...]>        Specify debugging level (scanner, parser, eval, netlink, mnl, segtree, all)\n"
++"  --debug <level [,level...]>        Specify debugging level (scanner, parser, eval, netlink, mnl, proto-ctx, segtree, all)\n"
  #endif
  "\n",
        name);
@@@ -138,10 -138,10 +138,14 @@@ static const struct 
                .name           = "netlink",
                .level          = DEBUG_NETLINK,
        },
+       {
+               .name           = "mnl",
+               .level          = DEBUG_MNL,
+       },
 +      {
 +              .name           = "proto-ctx",
 +              .level          = DEBUG_PROTO_CTX,
 +      },
        {
                .name           = "segtree",
                .level          = DEBUG_SEGTREE,

diff --cc src/parser.y
index fd6313687d4b4270115105e79356fb7e8a668697,345d8d067ae58fd40bf1af94c8d49d02ac903c75..3e3abeddf1de573b9a04a61ee023977d7969ef57
--- 1/src/parser.y
--- 2/src/parser.y
+++ b/src/parser.y
@@@ -183,7 -180,12 +182,11 @@@ static void location_update(struct loca
  %token JUMP                   "jump"
  %token GOTO                   "goto"
  %token RETURN                 "return"
 -%token QUEUE                  "queue"
  
+ %token CONSTANT                       "constant"
+ %token INTERVAL                       "interval"
+ %token ELEMENTS                       "elements"
+ 
  %token <val> NUM              "number"
  %token <string> STRING                "string"
  %token <string> QUOTED_STRING

diff --cc src/rule.c
Simple merge

diff --cc src/scanner.l
Simple merge