forked from Openwrt/openwrt
84d0b0b925
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 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 58344a3b85f1bd5ffddfc2c11f6f2bf688b5f990 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Mon, 11 Apr 2022 10:46:12 +0100
|
|
Subject: [PATCH 04/13] net: dsa: mt7530: drop use of
|
|
phylink_helper_basex_speed()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Now that we have a better method to select SFP interface modes, we
|
|
no longer need to use phylink_helper_basex_speed() in a driver's
|
|
validation function.
|
|
|
|
Tested-by: Marek Behún <kabel@kernel.org>
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -3242,11 +3242,6 @@ mt753x_phylink_validate(struct dsa_switc
|
|
|
|
linkmode_and(supported, supported, mask);
|
|
linkmode_and(state->advertising, state->advertising, mask);
|
|
-
|
|
- /* We can only operate at 2500BaseX or 1000BaseX. If requested
|
|
- * to advertise both, only report advertising at 2500BaseX.
|
|
- */
|
|
- phylink_helper_basex_speed(state);
|
|
}
|
|
|
|
static int
|