From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934758AbcHaNtw (ORCPT ); Wed, 31 Aug 2016 09:49:52 -0400 Received: from vps0.lunn.ch ([178.209.37.122]:59739 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933390AbcHaNts (ORCPT ); Wed, 31 Aug 2016 09:49:48 -0400 Date: Wed, 31 Aug 2016 15:49:43 +0200 From: Andrew Lunn To: Vivien Didelot Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Florian Fainelli Subject: Re: [PATCH net-next 2/3] net: dsa: mv88e6xxx: make switchdev DB ops generic Message-ID: <20160831134943.GB15078@lunn.ch> References: <20160829203246.18811-1-vivien.didelot@savoirfairelinux.com> <20160829203246.18811-3-vivien.didelot@savoirfairelinux.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160829203246.18811-3-vivien.didelot@savoirfairelinux.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Vivien > -static int _mv88e6xxx_port_fdb_dump_one(struct mv88e6xxx_chip *chip, > - u16 fid, u16 vid, int port, > - struct switchdev_obj_port_fdb *fdb, > - int (*cb)(struct switchdev_obj *obj)) > +static int mv88e6xxx_port_db_dump_one(struct mv88e6xxx_chip *chip, > + u16 fid, u16 vid, int port, > + struct switchdev_obj *obj, > + int (*cb)(struct switchdev_obj *obj)) > { > struct mv88e6xxx_atu_entry addr = { > .mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, > @@ -2222,72 +2219,87 @@ static int _mv88e6xxx_port_fdb_dump_one(struct mv88e6xxx_chip *chip, > do { > err = _mv88e6xxx_atu_getnext(chip, fid, &addr); > if (err) > - break; > + return err; > > if (addr.state == GLOBAL_ATU_DATA_STATE_UNUSED) > break; > > - if (!addr.trunk && addr.portv_trunkid & BIT(port)) { > - bool is_static = addr.state == > - (is_multicast_ether_addr(addr.mac) ? > - GLOBAL_ATU_DATA_STATE_MC_STATIC : > - GLOBAL_ATU_DATA_STATE_UC_STATIC); > + if (addr.trunk || (addr.portv_trunkid & BIT(port)) == 0) > + continue; > + > + if (obj->id == SWITCHDEV_OBJ_ID_PORT_FDB) { > + struct switchdev_obj_port_fdb *fdb; > > + if (!is_unicast_ether_addr(addr.mac)) > + continue; > + > + fdb = SWITCHDEV_OBJ_PORT_FDB(obj); > fdb->vid = vid; > ether_addr_copy(fdb->addr, addr.mac); > - fdb->ndm_state = is_static ? NUD_NOARP : NUD_REACHABLE; > - > - err = cb(&fdb->obj); > - if (err) > - break; > + if (addr.state == GLOBAL_ATU_DATA_STATE_UC_STATIC) > + fdb->ndm_state = NUD_NOARP; > + else > + fdb->ndm_state = NUD_REACHABLE; > } > + > + err = cb(obj); > + if (err) > + return err; > } while (!is_broadcast_ether_addr(addr.mac)); Humm, maybe i'm reading this patch wrong.... This function is called mv88e6xxx_port_db_dump_one(). But i don't see a way out of the while loop, after dumping one. It seems to dump the whole table until it reaches the end marker, which is the MAC broadcast address. Should we rename this function, drop the _one? Andrew