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)
76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
From 25d15dee34a1a40d5fd71636a205e3211f09fd1d Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:18:28 +0100
|
|
Subject: [PATCH 10/16] net: dsa: mt7530: move p5_intf_modes() function to
|
|
mt7530.c
|
|
|
|
In preparation of splitting mt7530.c into a driver for MDIO-connected
|
|
as well as MDIO-accessed built-in switches on one hand and MMIO-accessed
|
|
built-in switches move the p5_inft_modes() function from mt7530.h to
|
|
mt7530.c. The function is only needed there and will trigger a compiler
|
|
warning about a defined but unused function otherwise when including
|
|
mt7530.h in the to-be-introduced bus-specific drivers.
|
|
|
|
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 ++++++++++++++++++
|
|
drivers/net/dsa/mt7530.h | 18 ------------------
|
|
2 files changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -965,6 +965,24 @@ mt7530_set_ageing_time(struct dsa_switch
|
|
return 0;
|
|
}
|
|
|
|
+static const char *p5_intf_modes(unsigned int p5_interface)
|
|
+{
|
|
+ switch (p5_interface) {
|
|
+ case P5_DISABLED:
|
|
+ return "DISABLED";
|
|
+ case P5_INTF_SEL_PHY_P0:
|
|
+ return "PHY P0";
|
|
+ case P5_INTF_SEL_PHY_P4:
|
|
+ return "PHY P4";
|
|
+ case P5_INTF_SEL_GMAC5:
|
|
+ return "GMAC5";
|
|
+ case P5_INTF_SEL_GMAC5_SGMII:
|
|
+ return "GMAC5_SGMII";
|
|
+ default:
|
|
+ return "unknown";
|
|
+ }
|
|
+}
|
|
+
|
|
static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
--- a/drivers/net/dsa/mt7530.h
|
|
+++ b/drivers/net/dsa/mt7530.h
|
|
@@ -720,24 +720,6 @@ enum p5_interface_select {
|
|
P5_INTF_SEL_GMAC5_SGMII,
|
|
};
|
|
|
|
-static const char *p5_intf_modes(unsigned int p5_interface)
|
|
-{
|
|
- switch (p5_interface) {
|
|
- case P5_DISABLED:
|
|
- return "DISABLED";
|
|
- case P5_INTF_SEL_PHY_P0:
|
|
- return "PHY P0";
|
|
- case P5_INTF_SEL_PHY_P4:
|
|
- return "PHY P4";
|
|
- case P5_INTF_SEL_GMAC5:
|
|
- return "GMAC5";
|
|
- case P5_INTF_SEL_GMAC5_SGMII:
|
|
- return "GMAC5_SGMII";
|
|
- default:
|
|
- return "unknown";
|
|
- }
|
|
-}
|
|
-
|
|
struct mt7530_priv;
|
|
|
|
struct mt753x_pcs {
|