summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang2025-05-06 11:30:52 +0000
committerHauke Mehrtens2025-07-20 13:33:02 +0000
commit2a31e006d6e7432776a1a9d82aefc178c6ed491b (patch)
tree5cf96d2a4158485e470cef5ed068c523255f0274
parent1f7514bb92afb6a3ada5260e4901842e9426e3f0 (diff)
downloadopenwrt-2a31e006d6e7432776a1a9d82aefc178c6ed491b.tar.gz
ipq40xx: ipqess: remove explicit phylink_generic_validate() references
The phylink_generic_validate() can be automatically called if phylink_validate method was not given in the switch operations. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.6.y&id=5938bce4b6e2146d5194badd7ecf0acc6bf877fc Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18725 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch3
-rw-r--r--target/linux/ipq40xx/patches-6.6/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch2
-rw-r--r--target/linux/ipq40xx/patches-6.6/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch2
3 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch b/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch
index 8c908c07db..447e1898ff 100644
--- a/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch
+++ b/target/linux/ipq40xx/patches-6.6/700-net-ipqess-introduce-the-Qualcomm-IPQESS-driver.patch
@@ -88,7 +88,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+ipq_ess-objs := ipqess.o ipqess_ethtool.o
--- /dev/null
+++ b/drivers/net/ethernet/qualcomm/ipqess/ipqess.c
-@@ -0,0 +1,1249 @@
+@@ -0,0 +1,1248 @@
+// SPDX-License-Identifier: GPL-2.0 OR ISC
+/* Copyright (c) 2014 - 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017 - 2018, John Crispin <john@phrozen.org>
@@ -1154,7 +1154,6 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
+}
+
+static struct phylink_mac_ops ipqess_phylink_mac_ops = {
-+ .validate = phylink_generic_validate,
+ .mac_config = ipqess_mac_config,
+ .mac_link_up = ipqess_mac_link_up,
+ .mac_link_down = ipqess_mac_link_down,
diff --git a/target/linux/ipq40xx/patches-6.6/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch b/target/linux/ipq40xx/patches-6.6/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
index d273ef2656..47bf5e2c16 100644
--- a/target/linux/ipq40xx/patches-6.6/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
+++ b/target/linux/ipq40xx/patches-6.6/702-net-ipqess-Add-out-of-band-DSA-tagging-support.patch
@@ -142,7 +142,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
static void ipqess_hw_stop(struct ipqess *ess)
{
int i;
-@@ -1189,12 +1247,19 @@ static int ipqess_axi_probe(struct platf
+@@ -1188,12 +1246,19 @@ static int ipqess_axi_probe(struct platf
netif_napi_add(netdev, &ess->rx_ring[i].napi_rx, ipqess_rx_napi);
}
diff --git a/target/linux/ipq40xx/patches-6.6/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch b/target/linux/ipq40xx/patches-6.6/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch
index a366a51465..b85a9633fe 100644
--- a/target/linux/ipq40xx/patches-6.6/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch
+++ b/target/linux/ipq40xx/patches-6.6/704-net-qualcomm-ipqess-enable-threaded-NAPI-by-default.patch
@@ -38,7 +38,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
}
return IRQ_HANDLED;
-@@ -1269,6 +1269,8 @@ static int ipqess_axi_probe(struct platf
+@@ -1268,6 +1268,8 @@ static int ipqess_axi_probe(struct platf
if (err)
goto err_notifier_unregister;