net: dsa: bcm_sf2: Use SF2_NUM_EGRESS_QUEUES for CFP

The magic number 8 in 3 locations in bcm_sf2_cfp.c actually designates
the number of switch port egress queues, so use that define instead of
open-coding it.

Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c
index 8a1da7e677070d33571748c2b511d4e38169324f..94649e1481ecbebddc31bd95a5466480c088b7e8 100644 (file)
--- a/drivers/net/dsa/bcm_sf2_cfp.c
+++ b/drivers/net/dsa/bcm_sf2_cfp.c
@@ -144,7 +144,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,
         * destination port is enabled and that we are within the
         * number of ports supported by the switch
         */
-       port_num = fs->ring_cookie / 8;
+       port_num = fs->ring_cookie / SF2_NUM_EGRESS_QUEUES;
 
        if (fs->ring_cookie == RX_CLS_FLOW_DISC ||
            !(BIT(port_num) & ds->enabled_port_mask) ||
@@ -280,7 +280,7 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,
         * We have a small oddity where Port 6 just does not have a
         * valid bit here (so we subtract by one).
         */
-       queue_num = fs->ring_cookie % 8;
+       queue_num = fs->ring_cookie % SF2_NUM_EGRESS_QUEUES;
        if (port_num >= 7)
                port_num -= 1;
 
@@ -401,7 +401,7 @@ static int bcm_sf2_cfp_rule_get(struct bcm_sf2_priv *priv, int port,
        /* There is no Port 6, so we compensate for that here */
        if (nfc->fs.ring_cookie >= 6)
                nfc->fs.ring_cookie++;
-       nfc->fs.ring_cookie *= 8;
+       nfc->fs.ring_cookie *= SF2_NUM_EGRESS_QUEUES;
 
        /* Extract the destination queue */
        queue_num = (reg >> NEW_TC_SHIFT) & NEW_TC_MASK;