leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: b53: Use vlan_filtering property from dsa_switch

Browse Source 
While possible (and safe) to use the newly introduced
dsa_port_is_vlan_filtering helper, fabricating a dsa_port pointer is a
bit awkward, so simply retrieve this from the dsa_switch structure.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean
2019-04-28 21:45:53 +03:00
committed by David S. Miller
parent 864cd7b05d
commit e74f014eb4
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/dsa/b53/b53_common.c
View File

@@ -428,7 +428,6 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable,
b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt); b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);
dev->vlan_enabled = enable; dev->vlan_enabled = enable;
dev->vlan_filtering_enabled = enable_filtering;
} }
static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100) static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100)
@@ -665,7 +664,7 @@ int b53_configure_vlan(struct dsa_switch *ds)
b53_do_vlan_op(dev, VTA_CMD_CLEAR); b53_do_vlan_op(dev, VTA_CMD_CLEAR);
} }
b53_enable_vlan(dev, false, dev->vlan_filtering_enabled); b53_enable_vlan(dev, false, ds->vlan_filtering);
b53_for_each_port(dev, i) b53_for_each_port(dev, i)
b53_write16(dev, B53_VLAN_PAGE, b53_write16(dev, B53_VLAN_PAGE,
@@ -1318,7 +1317,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port,
if (vlan->vid_end > dev->num_vlans) if (vlan->vid_end > dev->num_vlans)
return -ERANGE; return -ERANGE;
b53_enable_vlan(dev, true, dev->vlan_filtering_enabled); b53_enable_vlan(dev, true, ds->vlan_filtering);
return 0; return 0;
} }

1
drivers/net/dsa/b53/b53_priv.h
View File

@@ -139,7 +139,6 @@ struct b53_device {
unsigned int num_vlans; unsigned int num_vlans;
struct b53_vlan *vlans; struct b53_vlan *vlans;
bool vlan_enabled; bool vlan_enabled;
bool vlan_filtering_enabled;
unsigned int num_ports; unsigned int num_ports;
struct b53_port *ports; struct b53_port *ports;
}; };