summaryrefslogtreecommitdiff
path: root/net/dsa/dsa.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-12-20 12:25:44 +0300
committerIngo Molnar <mingo@kernel.org>2024-12-20 12:25:44 +0300
commit60675d4ca1ef0857e44eba5849b74a3a998d0c0f (patch)
treeb2fa39712aeca80db32be43f3f5be8e5a58bc0a3 /net/dsa/dsa.c
parentdd4059634dab548c904eeae2660ba3c8f7ce843c (diff)
parent8faabc041a001140564f718dabe37753e88b37fa (diff)
downloadlinux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.tar.xz
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/dsa/dsa.c')
-rw-r--r--net/dsa/dsa.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 1664547deffd..5a7c0e565a89 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -1505,14 +1505,6 @@ static int dsa_switch_probe(struct dsa_switch *ds)
if (!ds->num_ports)
return -EINVAL;
- if (ds->phylink_mac_ops) {
- if (ds->ops->phylink_mac_select_pcs ||
- ds->ops->phylink_mac_config ||
- ds->ops->phylink_mac_link_down ||
- ds->ops->phylink_mac_link_up)
- return -EINVAL;
- }
-
if (np) {
err = dsa_switch_parse_of(ds, np);
if (err)