Commit 916a8d16 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: loop: Support 4K VLANs

Allocate a 4K array of VLANs instead of limiting ourselves to just 5
which is arbitrary.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81d4e8e0
...@@ -48,12 +48,10 @@ struct dsa_loop_port { ...@@ -48,12 +48,10 @@ struct dsa_loop_port {
u16 pvid; u16 pvid;
}; };
#define DSA_LOOP_VLANS 5
struct dsa_loop_priv { struct dsa_loop_priv {
struct mii_bus *bus; struct mii_bus *bus;
unsigned int port_base; unsigned int port_base;
struct dsa_loop_vlan vlans[DSA_LOOP_VLANS]; struct dsa_loop_vlan vlans[VLAN_N_VID];
struct net_device *netdev; struct net_device *netdev;
struct dsa_loop_port ports[DSA_MAX_PORTS]; struct dsa_loop_port ports[DSA_MAX_PORTS];
}; };
...@@ -191,7 +189,7 @@ dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port, ...@@ -191,7 +189,7 @@ dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port,
/* Just do a sleeping operation to make lockdep checks effective */ /* Just do a sleeping operation to make lockdep checks effective */
mdiobus_read(bus, ps->port_base + port, MII_BMSR); mdiobus_read(bus, ps->port_base + port, MII_BMSR);
if (vlan->vid_end > DSA_LOOP_VLANS) if (vlan->vid_end > ARRAY_SIZE(ps->vlans))
return -ERANGE; return -ERANGE;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment