| Message ID | 1401192245-26260-1-git-send-email-tklauser@distanz.ch |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 5/27/2014 8:04 AM, Tobias Klauser wrote: > Use is_valid_ether_addr() to check for a valid MAC address to set on the > device. This will also check for the device address being multicast, > which would have been possible previously. I don't think having a multicast address here is possible (i.e. as returned by gxio_mpipe_link_enumerate_mac), and it confuses the actual issue, which is handling the all-zeroes case in a simulator run. I'd prefer to see is_zero_ether_addr() instead. > Also use ether_addr_copy() instead of a manual memcpy() to set the > address. > > Furthermore, get rid of a redundant assignment of dev->addr_len. This is > already set by ether_setup() which is called in tile_net_setup(). > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > --- > drivers/net/ethernet/tile/tilegx.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) With the change above, Acked-by: Chris Metcalf <cmetcalf@tilera.com>
On 2014-05-28 at 21:43:33 +0200, Chris Metcalf <cmetcalf@tilera.com> wrote: > On 5/27/2014 8:04 AM, Tobias Klauser wrote: > >Use is_valid_ether_addr() to check for a valid MAC address to set on the > >device. This will also check for the device address being multicast, > >which would have been possible previously. > > I don't think having a multicast address here is possible (i.e. as returned > by gxio_mpipe_link_enumerate_mac), and it confuses the actual issue, which > is handling the all-zeroes case in a simulator run. I'd prefer to see > is_zero_ether_addr() instead. Ok, I'll send an updated patch which only tests for !is_zero_ether_addr() > >Also use ether_addr_copy() instead of a manual memcpy() to set the > >address. > > > >Furthermore, get rid of a redundant assignment of dev->addr_len. This is > >already set by ether_setup() which is called in tile_net_setup(). > > > >Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > >--- > > drivers/net/ethernet/tile/tilegx.c | 17 ++++++----------- > > 1 file changed, 6 insertions(+), 11 deletions(-) > > With the change above, > > Acked-by: Chris Metcalf <cmetcalf@tilera.com> > > -- > Chris Metcalf, Tilera Corp. > http://www.tilera.com > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 0db40de..6e978f8 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -2192,7 +2192,6 @@ static void tile_net_dev_init(const char *name, const uint8_t *mac) { int ret; int i; - int nz_addr = 0; struct net_device *dev; struct tile_net_priv *priv; @@ -2219,18 +2218,14 @@ static void tile_net_dev_init(const char *name, const uint8_t *mac) init_ptp_dev(priv); /* Get the MAC address and set it in the device struct; this must - * be done before the device is opened. If the MAC is all zeroes, - * we use a random address, since we're probably on the simulator. + * be done before the device is opened. If the MAC is all zeroes or a + * multicast address, we use a random address, since we're probably on + * the simulator. */ - for (i = 0; i < 6; i++) - nz_addr |= mac[i]; - - if (nz_addr) { - memcpy(dev->dev_addr, mac, ETH_ALEN); - dev->addr_len = 6; - } else { + if (is_valid_ether_addr(mac)) + ether_addr_copy(dev->dev_addr, mac); + else eth_hw_addr_random(dev); - } /* Register the network device. */ ret = register_netdev(dev);
Use is_valid_ether_addr() to check for a valid MAC address to set on the device. This will also check for the device address being multicast, which would have been possible previously. Also use ether_addr_copy() instead of a manual memcpy() to set the address. Furthermore, get rid of a redundant assignment of dev->addr_len. This is already set by ether_setup() which is called in tile_net_setup(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- drivers/net/ethernet/tile/tilegx.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)