[PATCH net-next] net: dsa: mv88e6xxx: unconditionally set ATU trunk

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Newsgroups	linux.kernel
Subject	[PATCH net-next] net: dsa: mv88e6xxx: unconditionally set ATU trunk
Date	Tue, 28 Mar 2017 21:20:02 +0200
Message-ID	<tq4OS-3L1-5@gated-at.bofh.it> (permalink)
X-Mailer	git-send-email 2.12.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	27
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" <davem@davemloft.net>, Florian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>, Vivien Didelot <vivien.didelot@savoirfairelinux.com>
X-Original-Date	Tue, 28 Mar 2017 15:09:43 -0400
X-Original-Message-ID	<20170328190943.18320-1-vivien.didelot@savoirfairelinux.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1611292

Show key headers only | View raw

Set the trunk member of the mv88e6xxx_atu_entry structure regardless its
value, so that uninitialized structures gets the correct boolean value.

Note that no mainline code is affected by the current behavior.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.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);
 	}
 
-- 
2.12.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next] net: dsa: mv88e6xxx: unconditionally set ATU trunk Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-03-28 21:20 +0200
  Re: [PATCH net-next] net: dsa: mv88e6xxx: unconditionally set ATU  trunk Florian Fainelli <f.fainelli@gmail.com> - 2017-03-28 21:40 +0200
  Re: [PATCH net-next] net: dsa: mv88e6xxx: unconditionally set ATU  trunk Andrew Lunn <andrew@lunn.ch> - 2017-03-28 21:40 +0200
  Re: [PATCH net-next] net: dsa: mv88e6xxx: unconditionally set ATU  trunk David Miller <davem@davemloft.net> - 2017-03-29 07:10 +0200

csiph-web