Merge branch 'next-4.2'

This branch adds support for the new 'netdev' family. This also resolves a
simple conflict with the default chain policy printing.

Conflicts:
	src/rule.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --cc include/rule.h
Simple merge

diff --cc src/netlink.c
Simple merge

diff --cc src/parser_bison.y
Simple merge

diff --cc src/payload.c
Simple merge

diff --cc src/rule.c
index 09d1ffd45e354928a0681442eafbc17b524b5edb,f930a374ca69dd09ed799ba94c2ff16d3ed7e3d2..8e3ef5f670165a74398224fe9161fd3f30313b8b
--- 1/src/rule.c
--- 2/src/rule.c
+++ b/src/rule.c
@@@ -465,9 -475,17 +475,18 @@@ static void chain_print(const struct ch
  
        printf("\tchain %s {\n", chain->handle.chain);
        if (chain->flags & CHAIN_F_BASECHAIN) {
-               printf("\t\ttype %s hook %s priority %d; policy %s;\n",
-                      chain->type, chain->hookstr,
-                      chain->priority, chain_policy2str(chain->policy));
+               if (chain->dev != NULL) {
 -                      printf("\t\ttype %s hook %s device %s priority %d;\n",
++                      printf("\t\ttype %s hook %s device %s priority %d; policy %s;\n",
+                              chain->type,
+                              hooknum2str(chain->handle.family, chain->hooknum),
 -                             chain->dev, chain->priority);
++                             chain->dev, chain->priority,
++                             chain_policy2str(chain->policy));
+               } else {
 -                      printf("\t\ttype %s hook %s priority %d;\n",
++                      printf("\t\ttype %s hook %s priority %d; policy %s;\n",
+                              chain->type,
+                              hooknum2str(chain->handle.family, chain->hooknum),
 -                             chain->priority);
++                             chain->priority, chain_policy2str(chain->policy));
+               }
        }
        list_for_each_entry(rule, &chain->rules, list) {
                printf("\t\t");