On 03/28/2017 12:09 PM, Vivien Didelot wrote: > Set the trunk member of the mv88e6xxx_atu_entry structure regardless its > value, so that uninitialized structures gets the correct boolean value.
Ouch, yes indeed! > > Note that no mainline code is affected by the current behavior. > > Signed-off-by: Vivien Didelot <vivien.dide...@savoirfairelinux.com> Reviewed-by: Florian Fainelli <f.faine...@gmail.com> > --- > drivers/net/dsa/mv88e6xxx/global1_atu.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/dsa/mv88e6xxx/global1_atu.c > b/drivers/net/dsa/mv88e6xxx/global1_atu.c > index 831434bc5c13..fa7e7db5171b 100644 > --- a/drivers/net/dsa/mv88e6xxx/global1_atu.c > +++ b/drivers/net/dsa/mv88e6xxx/global1_atu.c > @@ -128,9 +128,7 @@ static int mv88e6xxx_g1_atu_data_read(struct > mv88e6xxx_chip *chip, > > entry->state = val & 0xf; > if (entry->state != GLOBAL_ATU_DATA_STATE_UNUSED) { > - if (val & GLOBAL_ATU_DATA_TRUNK) > - entry->trunk = true; > - > + entry->trunk = !!(val & GLOBAL_ATU_DATA_TRUNK); > entry->portvec = (val >> 4) & mv88e6xxx_port_mask(chip); > } > > -- Florian