From: Andrew Lunn <andrew@lunn.ch>
To: David Miller <davem@davemloft.net>
Cc: Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
netdev <netdev@vger.kernel.org>, Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH net-next 3/6] net: dsa: mv88e6xxx: Fixed port netdev check for VLANs
Date: Wed, 27 Sep 2017 00:26:00 +0200 [thread overview]
Message-ID: <1506464764-12699-4-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1506464764-12699-1-git-send-email-andrew@lunn.ch>
Having the same VLAN on multiple bridges is currently unsupported as
an offload. mv88e6xxx_port_check_hw_vlan() is used to ensure that a
VLAN is not on multiple bridges when adding a VLAN range to a port. It
loops the ports and checks to see if there are ports in a different
bridge with the same VLAN.
While walking all switch ports, the code was checking if the new port
has a netdev attached to it. If not, skip checking the port being
walked. This seems like a typ0. If the new port does not have a
netdev, how has a VLAN been added to it in the first place, requiring
this check be performed at all? More likely, we should be checking if
the port being walked has a netdev. Without it having a netdev, it
cannot have a VLAN on it, so there is no need to check further for
that particular port.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index c6678aa9b4ef..884f0507cf48 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1120,7 +1120,7 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port,
if (dsa_is_dsa_port(ds, i) || dsa_is_cpu_port(ds, i))
continue;
- if (!ds->ports[port].netdev)
+ if (!ds->ports[i].netdev)
continue;
if (vlan.member[i] ==
--
2.14.1
next prev parent reply other threads:[~2017-09-26 22:26 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-26 22:25 [PATCH net-next 0/6] mv88e6xxx broadcast flooding in hardware Andrew Lunn
2017-09-26 22:25 ` [PATCH net-next 1/6] net: dsa: Fix SWITCHDEV_ATTR_ID_PORT_PARENT_ID Andrew Lunn
2017-09-27 10:15 ` Sergei Shtylyov
2017-09-27 15:31 ` Vivien Didelot
2017-09-26 22:25 ` [PATCH net-next 2/6] net: dsa: {e}dsa: set offload_fwd_mark on received packets Andrew Lunn
2017-09-27 19:46 ` Florian Fainelli
2017-09-27 20:11 ` Andrew Lunn
2017-09-26 22:26 ` Andrew Lunn [this message]
2017-09-26 22:26 ` [PATCH net-next 4/6] net: dsa: mv88e6xxx: Print offending port when vlan check fails Andrew Lunn
2017-09-27 15:49 ` Vivien Didelot
2017-09-26 22:26 ` [PATCH net-next 5/6] net: dsa: mv88e6xxx: Move mv88e6xxx_port_db_load_purge() Andrew Lunn
2017-09-27 15:51 ` Vivien Didelot
2017-09-26 22:26 ` [PATCH net-next 6/6] net: dsa: mv88e6xxx: Flood broadcast frames in hardware Andrew Lunn
2017-09-27 18:24 ` Vivien Didelot
2017-09-27 18:36 ` Andrew Lunn
2017-09-27 18:59 ` Vivien Didelot
2017-09-27 18:37 ` Florian Fainelli
2017-09-27 18:46 ` Andrew Lunn
2017-09-27 19:19 ` Vivien Didelot
2017-09-27 19:33 ` Florian Fainelli
2017-09-27 20:18 ` Andrew Lunn
2017-09-26 22:26 ` [PATCH 6/6] net: dsa: mv88e6xxx: Forward broadcast frames to cpu and dsa ports Andrew Lunn
2017-09-26 22:43 ` Andrew Lunn
2017-09-27 3:20 ` David Miller
2017-09-27 18:28 ` [PATCH net-next 0/6] mv88e6xxx broadcast flooding in hardware Vivien Didelot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1506464764-12699-4-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).