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>

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 8c908c07db2757ed2e433f067db559238133d45c..447e1898ff197ef9fac77586ff1e144df3baf123 100644 (file)
--- 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 d273ef2656d8eeec36c83b016a665988acb21cc2..47bf5e2c1613f370a27faadfd4670ebd10053aa1 100644 (file)
--- 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 a366a51465778e23d52aca9ba0c841cdc7b41ee8..b85a9633fe2f1b080f75471f5300b4f9c859dec5 100644 (file)
--- 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;