mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
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)
56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
From 720d736351761574af02ed093658ab60de60576c Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:18:50 +0100
|
|
Subject: [PATCH 12/16] net: dsa: mt7530: introduce mt7530_remove_common helper
|
|
function
|
|
|
|
Move commonly used parts from mt7530_remove into new
|
|
mt7530_remove_common helper function which will be used by both,
|
|
mt7530_remove and the to-be-introduced mt7988_remove.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 18 ++++++++++++------
|
|
1 file changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -3512,6 +3512,17 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
}
|
|
|
|
static void
|
|
+mt7530_remove_common(struct mt7530_priv *priv)
|
|
+{
|
|
+ if (priv->irq)
|
|
+ mt7530_free_irq(priv);
|
|
+
|
|
+ dsa_unregister_switch(priv->ds);
|
|
+
|
|
+ mutex_destroy(&priv->reg_mutex);
|
|
+}
|
|
+
|
|
+static void
|
|
mt7530_remove(struct mdio_device *mdiodev)
|
|
{
|
|
struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
|
|
@@ -3530,16 +3541,11 @@ mt7530_remove(struct mdio_device *mdiode
|
|
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
|
|
ret);
|
|
|
|
- if (priv->irq)
|
|
- mt7530_free_irq(priv);
|
|
-
|
|
- dsa_unregister_switch(priv->ds);
|
|
+ mt7530_remove_common(priv);
|
|
|
|
for (i = 0; i < 2; ++i)
|
|
mtk_pcs_lynxi_destroy(priv->ports[5 + i].sgmii_pcs);
|
|
|
|
- mutex_destroy(&priv->reg_mutex);
|
|
-
|
|
dev_set_drvdata(&mdiodev->dev, NULL);
|
|
}
|
|
|