kernel: bump 4.14 to 4.14.154

[oweals/openwrt.git] / target / linux / generic / backport-4.14 / 335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch

diff --git a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
index 6f85402c5d21adb522bf81b68e95fdd568ea572e..a577e621bdd9cdb22c04a6cdc41efa7cf68afdd1 100644 (file)
--- a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
+++ b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
@@ -42,7 +42,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        bool                            report;
  };
  
-@@ -944,6 +944,7 @@ unsigned int nft_do_chain(struct nft_pkt
+@@ -945,6 +945,7 @@ unsigned int nft_do_chain(struct nft_pkt
   *    @use: number of chain references to this table
   *    @flags: table flag (see enum nft_table_flags)
   *    @genmask: generation mask
@@ -50,7 +50,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
   *    @name: name of the table
   */
  struct nft_table {
-@@ -956,6 +957,7 @@ struct nft_table {
+@@ -957,6 +958,7 @@ struct nft_table {
        u32                             use;
        u16                             flags:14,
                                        genmask:2;
@@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        char                            *name;
  };
  
-@@ -965,13 +967,11 @@ struct nft_table {
+@@ -966,13 +968,11 @@ struct nft_table {
   *    @list: used internally
   *    @family: address family
   *    @owner: module owner