1 files changed, 0 insertions, 80 deletions
diff --git a/target/linux/generic/backport-4.19/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch b/target/linux/generic/backport-4.19/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
deleted file mode 100644
index 35c75a201e..0000000000
--- a/target/linux/generic/backport-4.19/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Tue, 19 Dec 2017 12:17:52 +0100
-Subject: [PATCH] netfilter: nf_tables: no need for struct nft_af_info to
- enable/disable table
-
-nf_tables_table_enable() and nf_tables_table_disable() take a pointer to
-struct nft_af_info that is never used, remove it.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
-
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -640,10 +640,7 @@ err:
- 	return err;
- }
- 
--static void _nf_tables_table_disable(struct net *net,
--				     const struct nft_af_info *afi,
--				     struct nft_table *table,
--				     u32 cnt)
-+static void nft_table_disable(struct net *net, struct nft_table *table, u32 cnt)
- {
- 	struct nft_chain *chain;
- 	u32 i = 0;
-@@ -661,9 +658,7 @@ static void _nf_tables_table_disable(str
- 	}
- }
- 
--static int nf_tables_table_enable(struct net *net,
--				  const struct nft_af_info *afi,
--				  struct nft_table *table)
-+static int nf_tables_table_enable(struct net *net, struct nft_table *table)
- {
- 	struct nft_chain *chain;
- 	int err, i = 0;
-@@ -683,15 +678,13 @@ static int nf_tables_table_enable(struct
- 	return 0;
- err:
- 	if (i)
--		_nf_tables_table_disable(net, afi, table, i);
-+		nft_table_disable(net, table, i);
- 	return err;
- }
- 
--static void nf_tables_table_disable(struct net *net,
--				    const struct nft_af_info *afi,
--				    struct nft_table *table)
-+static void nf_tables_table_disable(struct net *net, struct nft_table *table)
- {
--	_nf_tables_table_disable(net, afi, table, 0);
-+	nft_table_disable(net, table, 0);
- }
- 
- static int nf_tables_updtable(struct nft_ctx *ctx)
-@@ -720,7 +713,7 @@ static int nf_tables_updtable(struct nft
- 		nft_trans_table_enable(trans) = false;
- 	} else if (!(flags & NFT_TABLE_F_DORMANT) &&
- 		   ctx->table->flags & NFT_TABLE_F_DORMANT) {
--		ret = nf_tables_table_enable(ctx->net, ctx->afi, ctx->table);
-+		ret = nf_tables_table_enable(ctx->net, ctx->table);
- 		if (ret >= 0) {
- 			ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
- 			nft_trans_table_enable(trans) = true;
-@@ -5792,7 +5785,6 @@ static int nf_tables_commit(struct net *
- 			if (nft_trans_table_update(trans)) {
- 				if (!nft_trans_table_enable(trans)) {
- 					nf_tables_table_disable(net,
--								trans->ctx.afi,
- 								trans->ctx.table);
- 					trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
- 				}
-@@ -5956,7 +5948,6 @@ static int nf_tables_abort(struct net *n
- 			if (nft_trans_table_update(trans)) {
- 				if (nft_trans_table_enable(trans)) {
- 					nf_tables_table_disable(net,
--								trans->ctx.afi,
- 								trans->ctx.table);
- 					trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
- 				}