kernel: bump 4.14 to 4.14.104

[openwrt/staging/wigyori.git] / target / linux / generic / backport-4.14 / 357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch

diff --git a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
index 3cc644a53000b95ea26f585aed4c3dbce352281f..601df0cf951bf5092742ed0bc3f79959d621a53a 100644 (file)
--- a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
+++ b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
@@ -236,7 +236,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        .owner          = THIS_MODULE,
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
        .owner          = THIS_MODULE,
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c

-@@ -5075,40 +5075,38 @@ static int nf_tables_newflowtable(struct
+@@ -5080,40 +5080,38 @@ static int nf_tables_newflowtable(struct

        }
  
        flowtable->data.type = type;
        }
  
        flowtable->data.type = type;


@@ -285,7 +285,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  err3:
        module_put(type->owner);
  err2:
  err3:
        module_put(type->owner);
  err2:

-@@ -5389,10 +5387,8 @@ err:
+@@ -5394,10 +5392,8 @@ err:

  
  static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable)
  {
  
  static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable)
  {