OSDN Git Service

net: dsa: microchip: ksz8795: really set the correct number of ports
authorMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Wed, 16 Sep 2020 10:08:39 +0000 (12:08 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Sep 2020 00:46:09 +0000 (17:46 -0700)
The KSZ9477 and KSZ8795 use the port_cnt field differently: For the
KSZ9477, it includes the CPU port(s), while for the KSZ8795, it doesn't.

It would be a good cleanup to make the handling of both drivers match,
but as a first step, fix the recently broken assignment of num_ports in
the KSZ8795 driver (which completely broke probing, as the CPU port
index was always failing the num_ports check).

Fixes: af199a1a9cb0 ("net: dsa: microchip: set the correct number of ports")
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/microchip/ksz8795.c

index f7d59d7..f5779e1 100644 (file)
@@ -1260,7 +1260,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
        }
 
        /* set the real number of ports */
-       dev->ds->num_ports = dev->port_cnt;
+       dev->ds->num_ports = dev->port_cnt + 1;
 
        return 0;
 }