68bc059c55
Manually rebased:
backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch
pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch*
Removed upstreamed:
generic-backport/610-v6.3-net-page_pool-use-in_softirq-instead.patch[1]
backport-5.15/705-12-v6.0-net-dsa-mt7530-rework-mt753-01-_setup.patch[2]
backport-5.15/790-v6.4-0010-net-dsa-mt7530-split-off-common-parts-from-mt7531_se.patch[3]
backport-5.15/703-10-v5.16-net-dsa-introduce-helpers-for-iterating-through-port.patch[4]
All other patches automatically rebased.
* Modified to define the variable i as suggested by DragonBluep in PR discussion.
See: https://github.com/openwrt/openwrt/pull/12823#issuecomment-1578518576
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=3af319d5147454dc63665ef451229c674b538377
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=0753c1ef24194580f7165ae6e259b59a851392f2
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=5a7266feaa6d708fc6880a161786eaa884ef3c8e
4. 9902f91cf6
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 5714660643e9170920be2abbb2297d9aac0b9533)
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 072eea6c22b2af680c3949e64f9adde278c71e68 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 30 Nov 2021 13:10:01 +0000
|
|
Subject: [PATCH] net: dsa: replace phylink_get_interfaces() with
|
|
phylink_get_caps()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Phylink needs slightly more information than phylink_get_interfaces()
|
|
allows us to get from the DSA drivers - we need the MAC capabilities.
|
|
Replace the phylink_get_interfaces() method with phylink_get_caps() to
|
|
allow DSA drivers to fill in the phylink_config MAC capabilities field
|
|
as well.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Marek Behún <kabel@kernel.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
include/net/dsa.h | 4 ++--
|
|
net/dsa/port.c | 5 ++---
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
--- a/include/net/dsa.h
|
|
+++ b/include/net/dsa.h
|
|
@@ -654,8 +654,8 @@ struct dsa_switch_ops {
|
|
/*
|
|
* PHYLINK integration
|
|
*/
|
|
- void (*phylink_get_interfaces)(struct dsa_switch *ds, int port,
|
|
- unsigned long *supported_interfaces);
|
|
+ void (*phylink_get_caps)(struct dsa_switch *ds, int port,
|
|
+ struct phylink_config *config);
|
|
void (*phylink_validate)(struct dsa_switch *ds, int port,
|
|
unsigned long *supported,
|
|
struct phylink_link_state *state);
|
|
--- a/net/dsa/port.c
|
|
+++ b/net/dsa/port.c
|
|
@@ -1111,9 +1111,8 @@ int dsa_port_phylink_create(struct dsa_p
|
|
if (err)
|
|
mode = PHY_INTERFACE_MODE_NA;
|
|
|
|
- if (ds->ops->phylink_get_interfaces)
|
|
- ds->ops->phylink_get_interfaces(ds, dp->index,
|
|
- dp->pl_config.supported_interfaces);
|
|
+ if (ds->ops->phylink_get_caps)
|
|
+ ds->ops->phylink_get_caps(ds, dp->index, &dp->pl_config);
|
|
|
|
dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn),
|
|
mode, &dsa_port_phylink_mac_ops);
|