438e593f22
Removed because they are upstream:
generic/backport-5.15/741-v6.9-01-netfilter-flowtable-validate-pppoe-header.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=d06977b9a4109f8738bb276125eb6a0b772bc433
Removed because they are upstream:
generic/backport-5.15/741-v6.9-02-netfilter-flowtable-incorrect-pppoe-tuple.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=e719b52d0c56989b0f3475a03a6d64f182c85b56
Manual adapted the following patches:
generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
generic/pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch
generic/hack-5.15/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 84d0b0b925)
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From dbd88e6fdd547cf8f6765b8dade9f89cf5c0ead9 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 17 Jan 2022 16:38:10 +0100
|
|
Subject: [PATCH] clk: Use clamp instead of open-coding our own
|
|
|
|
The code in clk_set_rate_range() will, if the current rate is outside of
|
|
the new range, force it to the minimum or maximum.
|
|
|
|
Since it's running under the condition that the rate is either lower
|
|
than the minimum, or higher than the maximum, this is equivalent to
|
|
using clamp, while being less readable. Let's switch to using clamp
|
|
instead.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/clk/clk.c | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
--- a/drivers/clk/clk.c
|
|
+++ b/drivers/clk/clk.c
|
|
@@ -2490,11 +2490,7 @@ int clk_set_rate_range(struct clk *clk,
|
|
* this corner case when determining the rate
|
|
*/
|
|
|
|
- if (rate < min)
|
|
- rate = min;
|
|
- else
|
|
- rate = max;
|
|
-
|
|
+ rate = clamp(clk->core->req_rate, min, max);
|
|
ret = clk_core_set_rate_nolock(clk->core, rate);
|
|
if (ret) {
|
|
/* rollback the changes */
|