提交 5c08d7e4 编写于 作者: L Linus Walleij 提交者: Greg Kroah-Hartman

net: dsa: rtl8366: Check VLAN ID and not ports

[ Upstream commit e8521e53cca584ddf8ec4584d3c550a6c65f88c4 ]

There has been some confusion between the port number and
the VLAN ID in this driver. What we need to check for
validity is the VLAN ID, nothing else.

The current confusion came from assigning a few default
VLANs for default routing and we need to rewrite that
properly.

Instead of checking if the port number is a valid VLAN
ID, check the actual VLAN IDs passed in to the callback
one by one as expected.

Fixes: d8652956 ("net: dsa: realtek-smi: Add Realtek SMI driver")
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 3c1f0704
...@@ -339,10 +339,12 @@ int rtl8366_vlan_prepare(struct dsa_switch *ds, int port, ...@@ -339,10 +339,12 @@ int rtl8366_vlan_prepare(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan) const struct switchdev_obj_port_vlan *vlan)
{ {
struct realtek_smi *smi = ds->priv; struct realtek_smi *smi = ds->priv;
u16 vid;
int ret; int ret;
if (!smi->ops->is_vlan_valid(smi, port)) for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++)
return -EINVAL; if (!smi->ops->is_vlan_valid(smi, vid))
return -EINVAL;
dev_info(smi->dev, "prepare VLANs %04x..%04x\n", dev_info(smi->dev, "prepare VLANs %04x..%04x\n",
vlan->vid_begin, vlan->vid_end); vlan->vid_begin, vlan->vid_end);
...@@ -370,8 +372,9 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, ...@@ -370,8 +372,9 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port,
u16 vid; u16 vid;
int ret; int ret;
if (!smi->ops->is_vlan_valid(smi, port)) for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++)
return; if (!smi->ops->is_vlan_valid(smi, vid))
return;
dev_info(smi->dev, "add VLAN on port %d, %s, %s\n", dev_info(smi->dev, "add VLAN on port %d, %s, %s\n",
port, port,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册