[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: iptables: add iptables-mod-socket kernel: bump 5.19 to 5.19.14 (coolsnowwolf#10228) kernel: bump 5.15 to 5.15.72 (coolsnowwolf#10230) kernel: bump 5.10 to 5.10.147 (coolsnowwolf#10231) kernel: bump 5.4 to 5.4.216 (coolsnowwolf#10232)
JocyHu · Oct 6, 2022 · efa4430 · efa4430
2 parents e16be6a + 4612152
commit efa4430
Show file tree

Hide file tree

Showing 55 changed files with 235 additions and 291 deletions.
diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .146
-LINUX_KERNEL_HASH-5.10.146 = 7bbd97f3278eadb73c19a1ca8c1a655c60afcee9f487b910063cdd15e9ee6dc1
+LINUX_VERSION-5.10 = .147
+LINUX_KERNEL_HASH-5.10.147 = 85253abf097eb5013b988a400eb022eed0e0626e7e0a7daa3ab4b6bcabbced9a
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .71
-LINUX_KERNEL_HASH-5.15.71 = 5f5408138e016c0e029e015d98ceab86f4e6366c65cd611259dac808ab1d1e53
+LINUX_VERSION-5.15 = .72
+LINUX_KERNEL_HASH-5.15.72 = 6090323b5b471ae9d3bbc0058966113609f5bbd22fa19a76df32a8abc52f07ab
diff --git a/include/kernel-5.19 b/include/kernel-5.19
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.19 = .12
-LINUX_KERNEL_HASH-5.19.12 = c436a548c7312ce6fc5a3472cbead895eef8f52841fbe7c71fd8e48bdfe2b0ba
+LINUX_VERSION-5.19 = .14
+LINUX_KERNEL_HASH-5.19.14 = 1ded27e1c4a8b51df5f93f2f772827183b805d9ab4771071307c13ee86cd1ac1
diff --git a/include/kernel-5.4 b/include/kernel-5.4
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .215
-LINUX_KERNEL_HASH-5.4.215 = 2d2bf7c3a25297f2b4686aa50a7cdaac68b52fc4c81b2cd3dddfe9f592b34ebd
+LINUX_VERSION-5.4 = .216
+LINUX_KERNEL_HASH-5.4.216 = ce5f62017334fec9b812fa952f653d4aa978a7f94e562511e1c4b5ef81ea7ea7
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
@@ -393,6 +393,19 @@ iptables extension for triggering a LED.
 
 endef
 
+define Package/iptables-mod-socket
+$(call Package/iptables/Module, +kmod-ipt-socket)
+  TITLE:=Socket match iptables extensions
+endef
+
+define Package/iptables-mod-socket/description
+Socket match iptables extensions.
+
+ Matches:
+  - socket
+
+endef
+
 define Package/iptables-mod-tproxy
 $(call Package/iptables/Module, +kmod-ipt-tproxy)
   TITLE:=Transparent proxy iptables extensions
@@ -401,9 +414,6 @@ endef
 define Package/iptables-mod-tproxy/description
 Transparent proxy iptables extensions.
 
- Matches:
-  - socket
-
  Targets:
   - TPROXY
 
@@ -678,6 +688,7 @@ $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
 $(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
 $(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
 $(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
+$(eval $(call BuildPlugin,iptables-mod-socket,$(IPT_SOCKET-m)))
 $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
 $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
 $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))

diff --git a/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6497,6 +6506,10 @@ static int __init cgroup_disable(char *s
+@@ -6503,6 +6512,10 @@ static int __init cgroup_disable(char *s
  			    strcmp(token, ss->legacy_name))
  				continue;
 
@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  			static_branch_disable(cgroup_subsys_enabled_key[i]);
  			pr_info("Disabling %s control group subsystem\n",
  				ss->name);
-@@ -6515,6 +6528,31 @@ static int __init cgroup_disable(char *s
+@@ -6521,6 +6534,31 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
 

diff --git a/...t/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch b/...t/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  #include <net/dsa.h>
 
  #include "mt7530.h"
-@@ -1534,6 +1535,109 @@ mtk_get_tag_protocol(struct dsa_switch *
+@@ -1537,6 +1538,109 @@ mtk_get_tag_protocol(struct dsa_switch *
  	}
  }
 
@@ -137,7 +137,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static int
  mt7530_setup(struct dsa_switch *ds)
  {
-@@ -1676,6 +1780,12 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -1679,6 +1783,12 @@ mt7530_setup(struct dsa_switch *ds)
  		}
  	}
 

diff --git a/...t/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch b/...t/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2366,6 +2366,17 @@ static void mt753x_phylink_mac_link_up(s
+@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s
  			mcr |= PMCR_RX_FC_EN;
  	}
 
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mt7530_set(priv, MT7530_PMCR_P(port), mcr);
  }
 
-@@ -2596,6 +2607,36 @@ mt753x_phy_write(struct dsa_switch *ds,
+@@ -2599,6 +2610,36 @@ mt753x_phy_write(struct dsa_switch *ds,
  	return priv->info->phy_write(ds, port, regnum, val);
  }
 
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static const struct dsa_switch_ops mt7530_switch_ops = {
  	.get_tag_protocol	= mtk_get_tag_protocol,
  	.setup			= mt753x_setup,
-@@ -2624,6 +2665,8 @@ static const struct dsa_switch_ops mt753
+@@ -2627,6 +2668,8 @@ static const struct dsa_switch_ops mt753
  	.phylink_mac_an_restart	= mt753x_phylink_mac_an_restart,
  	.phylink_mac_link_down	= mt753x_phylink_mac_link_down,
  	.phylink_mac_link_up	= mt753x_phylink_mac_link_up,

diff --git a/...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	int irq;
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -4987,7 +4987,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5000,7 +5000,7 @@ int stmmac_dvr_probe(struct device *devi
  	priv->wol_irq = res->wol_irq;
  	priv->lpi_irq = res->lpi_irq;
 

diff --git a/target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch b/target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch
@@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -1015,6 +1015,53 @@ mt7530_port_disable(struct dsa_switch *d
+@@ -1018,6 +1018,53 @@ mt7530_port_disable(struct dsa_switch *d
  	mutex_unlock(&priv->reg_mutex);
  }
 
@@ -73,7 +73,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static void
  mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state)
  {
-@@ -2647,6 +2694,8 @@ static const struct dsa_switch_ops mt753
+@@ -2650,6 +2697,8 @@ static const struct dsa_switch_ops mt753
  	.get_sset_count		= mt7530_get_sset_count,
  	.port_enable		= mt7530_port_enable,
  	.port_disable		= mt7530_port_disable,

diff --git a/target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch b/target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch
@@ -18,15 +18,15 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -1703,6 +1703,7 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -1706,6 +1706,7 @@ mt7530_setup(struct dsa_switch *ds)
  	 */
  	dn = dsa_to_port(ds, MT7530_CPU_PORT)->master->dev.of_node->parent;
  	ds->configure_vlan_while_not_filtering = true;
 +	ds->mtu_enforcement_ingress = true;
 
  	if (priv->id == ID_MT7530) {
  		regulator_set_voltage(priv->core_pwr, 1000000, 1000000);
-@@ -1948,6 +1949,7 @@ mt7531_setup(struct dsa_switch *ds)
+@@ -1953,6 +1954,7 @@ mt7531_setup(struct dsa_switch *ds)
  	}
 
  	ds->configure_vlan_while_not_filtering = true;

diff --git a/...et/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch b/...et/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -870,6 +870,46 @@ mt7530_get_sset_count(struct dsa_switch
+@@ -873,6 +873,46 @@ mt7530_get_sset_count(struct dsa_switch
  	return ARRAY_SIZE(mt7530_mib);
  }
 
@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
  {
  	struct mt7530_priv *priv = ds->priv;
-@@ -2694,6 +2734,7 @@ static const struct dsa_switch_ops mt753
+@@ -2697,6 +2737,7 @@ static const struct dsa_switch_ops mt753
  	.phy_write		= mt753x_phy_write,
  	.get_ethtool_stats	= mt7530_get_ethtool_stats,
  	.get_sset_count		= mt7530_get_sset_count,

diff --git a/target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch b/target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch
@@ -14,7 +14,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -998,9 +998,6 @@ mt753x_cpu_port_enable(struct dsa_switch
+@@ -1001,9 +1001,6 @@ mt753x_cpu_port_enable(struct dsa_switch
  	mt7530_write(priv, MT7530_PVC_P(port),
  		     PORT_SPEC_TAG);
 
@@ -24,7 +24,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
  	/* Set CPU port number */
  	if (priv->id == ID_MT7621)
  		mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));
-@@ -1131,6 +1128,20 @@ mt7530_stp_state_set(struct dsa_switch *
+@@ -1134,6 +1131,20 @@ mt7530_stp_state_set(struct dsa_switch *
  }
 
  static int
@@ -45,7 +45,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
  mt7530_port_bridge_join(struct dsa_switch *ds, int port,
  			struct net_device *bridge)
  {
-@@ -1331,6 +1342,63 @@ err:
+@@ -1334,6 +1345,63 @@ err:
  }
 
  static int
@@ -109,7 +109,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
  mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid)
  {
  	struct mt7530_dummy_poll p;
-@@ -2740,11 +2808,15 @@ static const struct dsa_switch_ops mt753
+@@ -2743,11 +2811,15 @@ static const struct dsa_switch_ops mt753
  	.port_change_mtu	= mt7530_port_change_mtu,
  	.port_max_mtu		= mt7530_port_max_mtu,
  	.port_stp_state_set	= mt7530_stp_state_set,

diff --git a/target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch b/target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch
@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #include <linux/of_mdio.h>
  #include <linux/of_net.h>
  #include <linux/of_platform.h>
-@@ -600,18 +601,14 @@ mt7530_mib_reset(struct dsa_switch *ds)
+@@ -603,18 +604,14 @@ mt7530_mib_reset(struct dsa_switch *ds)
  	mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE);
  }
 
@@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	return mdiobus_write_nested(priv->bus, port, regnum, val);
  }
 
-@@ -789,9 +786,8 @@ out:
+@@ -792,9 +789,8 @@ out:
  }
 
  static int
@@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	int devad;
  	int ret;
 
-@@ -807,10 +803,9 @@ mt7531_ind_phy_read(struct dsa_switch *d
+@@ -810,10 +806,9 @@ mt7531_ind_phy_read(struct dsa_switch *d
  }
 
  static int
@@ -71,7 +71,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	int devad;
  	int ret;
 
-@@ -826,6 +821,22 @@ mt7531_ind_phy_write(struct dsa_switch *
+@@ -829,6 +824,22 @@ mt7531_ind_phy_write(struct dsa_switch *
  	return ret;
  }
 
@@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void
  mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset,
  		   uint8_t *data)
-@@ -1793,6 +1804,210 @@ mt7530_setup_gpio(struct mt7530_priv *pr
+@@ -1796,6 +1807,210 @@ mt7530_setup_gpio(struct mt7530_priv *pr
  	return devm_gpiochip_add_data(dev, gc, priv);
  }
 
@@ -305,7 +305,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int
  mt7530_setup(struct dsa_switch *ds)
  {
-@@ -2744,24 +2959,20 @@ static int
+@@ -2747,24 +2962,20 @@ static int
  mt753x_setup(struct dsa_switch *ds)
  {
  	struct mt7530_priv *priv = ds->priv;
@@ -340,7 +340,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
 
  static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
-@@ -2798,8 +3009,6 @@ static const struct dsa_switch_ops mt753
+@@ -2801,8 +3012,6 @@ static const struct dsa_switch_ops mt753
  	.get_tag_protocol	= mtk_get_tag_protocol,
  	.setup			= mt753x_setup,
  	.get_strings		= mt7530_get_strings,
@@ -349,7 +349,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	.get_ethtool_stats	= mt7530_get_ethtool_stats,
  	.get_sset_count		= mt7530_get_sset_count,
  	.set_ageing_time	= mt7530_set_ageing_time,
-@@ -2982,6 +3191,9 @@ mt7530_remove(struct mdio_device *mdiode
+@@ -2985,6 +3194,9 @@ mt7530_remove(struct mdio_device *mdiode
  		dev_err(priv->dev, "Failed to disable io pwr: %d\n",
  			ret);
 

diff --git a/...ric/backport-5.15/705-01-v5.17-net-dsa-mt7530-iterate-using-dsa_switch_for_each_use.patch b/...ric/backport-5.15/705-01-v5.17-net-dsa-mt7530-iterate-using-dsa_switch_for_each_use.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -1188,27 +1188,31 @@ static int
+@@ -1191,27 +1191,31 @@ static int
  mt7530_port_bridge_join(struct dsa_switch *ds, int port,
  			struct net_device *bridge)
  {
@@ -65,7 +65,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  	}
 
  	/* Add the all other ports to this port matrix. */
-@@ -1301,24 +1305,28 @@ static void
+@@ -1304,24 +1308,28 @@ static void
  mt7530_port_bridge_leave(struct dsa_switch *ds, int port,
  			 struct net_device *bridge)
  {

diff --git a/...ric/backport-5.15/705-02-v5.19-net-dsa-mt7530-populate-supported_interfaces-and-mac.patch b/...ric/backport-5.15/705-02-v5.19-net-dsa-mt7530-populate-supported_interfaces-and-mac.patch
@@ -23,7 +23,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2385,6 +2385,32 @@ mt7531_setup(struct dsa_switch *ds)
+@@ -2390,6 +2390,32 @@ mt7531_setup(struct dsa_switch *ds)
  	return 0;
  }
 
@@ -56,7 +56,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  static bool
  mt7530_phy_mode_supported(struct dsa_switch *ds, int port,
  			  const struct phylink_link_state *state)
-@@ -2421,6 +2447,37 @@ static bool mt7531_is_rgmii_port(struct
+@@ -2426,6 +2452,37 @@ static bool mt7531_is_rgmii_port(struct
  	return (port == 5) && (priv->p5_intf_sel != P5_INTF_SEL_GMAC5_SGMII);
  }
 
@@ -94,7 +94,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  static bool
  mt7531_phy_mode_supported(struct dsa_switch *ds, int port,
  			  const struct phylink_link_state *state)
-@@ -2899,6 +2956,18 @@ mt7531_cpu_port_config(struct dsa_switch
+@@ -2902,6 +2959,18 @@ mt7531_cpu_port_config(struct dsa_switch
  	return 0;
  }
 
@@ -113,39 +113,39 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  static void
  mt7530_mac_port_validate(struct dsa_switch *ds, int port,
  			 unsigned long *supported)
-@@ -3134,6 +3203,7 @@ static const struct dsa_switch_ops mt753
+@@ -3137,6 +3206,7 @@ static const struct dsa_switch_ops mt753
  	.port_vlan_del		= mt7530_port_vlan_del,
  	.port_mirror_add	= mt753x_port_mirror_add,
  	.port_mirror_del	= mt753x_port_mirror_del,
 +	.phylink_get_caps	= mt753x_phylink_get_caps,
  	.phylink_validate	= mt753x_phylink_validate,
  	.phylink_mac_link_state	= mt753x_phylink_mac_link_state,
  	.phylink_mac_config	= mt753x_phylink_mac_config,
-@@ -3151,6 +3221,7 @@ static const struct mt753x_info mt753x_t
+@@ -3154,6 +3224,7 @@ static const struct mt753x_info mt753x_t
  		.phy_read = mt7530_phy_read,
  		.phy_write = mt7530_phy_write,
  		.pad_setup = mt7530_pad_clk_setup,
 +		.mac_port_get_caps = mt7530_mac_port_get_caps,
  		.phy_mode_supported = mt7530_phy_mode_supported,
  		.mac_port_validate = mt7530_mac_port_validate,
  		.mac_port_get_state = mt7530_phylink_mac_link_state,
-@@ -3162,6 +3233,7 @@ static const struct mt753x_info mt753x_t
+@@ -3165,6 +3236,7 @@ static const struct mt753x_info mt753x_t
  		.phy_read = mt7530_phy_read,
  		.phy_write = mt7530_phy_write,
  		.pad_setup = mt7530_pad_clk_setup,
 +		.mac_port_get_caps = mt7530_mac_port_get_caps,
  		.phy_mode_supported = mt7530_phy_mode_supported,
  		.mac_port_validate = mt7530_mac_port_validate,
  		.mac_port_get_state = mt7530_phylink_mac_link_state,
-@@ -3174,6 +3246,7 @@ static const struct mt753x_info mt753x_t
+@@ -3177,6 +3249,7 @@ static const struct mt753x_info mt753x_t
  		.phy_write = mt7531_ind_phy_write,
  		.pad_setup = mt7531_pad_setup,
  		.cpu_port_config = mt7531_cpu_port_config,
 +		.mac_port_get_caps = mt7531_mac_port_get_caps,
  		.phy_mode_supported = mt7531_phy_mode_supported,
  		.mac_port_validate = mt7531_mac_port_validate,
  		.mac_port_get_state = mt7531_phylink_mac_link_state,
-@@ -3236,6 +3309,7 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3239,6 +3312,7 @@ mt7530_probe(struct mdio_device *mdiodev
  	 */
  	if (!priv->info->sw_setup || !priv->info->pad_setup ||
  	    !priv->info->phy_read || !priv->info->phy_write ||