net: dsa: mv88e6xxx: write MAC outside of ATU Get Next code
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Thu, 22 Oct 2015 13:34:40 +0000 (09:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Oct 2015 14:38:38 +0000 (07:38 -0700)
There is no need to write the MAC address before every Get Next
operation, since ATU MAC registers are not cleared between calls.

Move the _mv88e6xxx_atu_mac_write call outside of _mv88e6xxx_atu_getnext
so future code could call ATU Get Next multiple times and save a few
register access.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx.c

index 4b6baa6e90cd3cbef624ca6a93cc17a5ce795f3d..86cbb677b7a88271bc34c26051149951fddc2390 100644 (file)
@@ -1751,7 +1751,6 @@ int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,
 }
 
 static int _mv88e6xxx_atu_getnext(struct dsa_switch *ds, u16 fid,
-                                 const unsigned char *addr,
                                  struct mv88e6xxx_atu_entry *entry)
 {
        struct mv88e6xxx_atu_entry next = { 0 };
@@ -1763,10 +1762,6 @@ static int _mv88e6xxx_atu_getnext(struct dsa_switch *ds, u16 fid,
        if (ret < 0)
                return ret;
 
-       ret = _mv88e6xxx_atu_mac_write(ds, addr);
-       if (ret < 0)
-               return ret;
-
        ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_ATU_FID, fid);
        if (ret < 0)
                return ret;
@@ -1827,7 +1822,11 @@ int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
                        fid = vtu.fid;
                }
 
-               ret = _mv88e6xxx_atu_getnext(ds, fid, addr, &next);
+               ret = _mv88e6xxx_atu_mac_write(ds, addr);
+               if (ret < 0)
+                       goto unlock;
+
+               ret = _mv88e6xxx_atu_getnext(ds, fid, &next);
                if (ret < 0)
                        goto unlock;