From 635c3a5338d5f4025588ba1c34cfdb3b86ff2c5b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 26 Feb 2020 15:34:05 +0800 Subject: [PATCH] kernel 4.14/4.19: fix label 'err_unlock' used but not defined Ref: project-openwrt/openwrt@03f6c13 --- .../generic/pending-4.14/601-add-kernel-imq-support.patch | 4 ++-- .../generic/pending-4.19/601-add-kernel-imq-support.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch index 3d5f1de1d2..5e6cdcfee9 100644 --- a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch @@ -1915,7 +1915,7 @@ + qh = rcu_dereference(queue_imq_handler); +#else + BUG(); -+ goto err_unlock; ++ goto err; +#endif + } else { + qh = rcu_dereference(net->nf.queue_handler); @@ -2041,4 +2041,4 @@ + /* * Transmit possibly several skbs, and handle the return status as - * required. Owning running seqcount bit guarantees that \ No newline at end of file + * required. Owning running seqcount bit guarantees that diff --git a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch index 734f0f7f31..2e8451af55 100644 --- a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch @@ -1592,7 +1592,7 @@ diff -Naupr linux-4.19.94_orig/net/netfilter/nf_queue.c linux-4.19.94/net/netfil + qh = rcu_dereference(queue_imq_handler); +#else + BUG(); -+ goto err_unlock; ++ goto err; +#endif + } else { + qh = rcu_dereference(net->nf.queue_handler);