1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 2052e51edd5d..5da50b00fdf6 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -707,11 +707,10 @@ int mv88e6xxx_setup_port_common(struct dsa_switch *ds, int port)
 
         mutex_lock(&ps->smi_mutex);
 
-        /* Port Control 1: disable trunking.  Also, if this is the
-         * CPU port, enable learn messages to be sent to this port.
+        /* Port Control 1: disable trunking, disable sending
+         * learning messages to this port.
          */
-        ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), 0x05,
-                                   dsa_is_cpu_port(ds, port) ? 0x8000 : 0x0000);
+        ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), 0x05, 0x0000);
         if (ret)
                 goto abort;