diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-01-27 15:29:36 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-29 18:42:46 -0500 |
| commit | a0c02161ecfc2f40a0837926efac5376bc6fd6d3 (patch) | |
| tree | f92b3c15cc967474f75c35d91f0450c5970e8fb9 /include | |
| parent | Merge branch 'ravb-gigabit-R-Car-H3-ES1.1-and-R-Car-M3-W' (diff) | |
| download | linux-dev-a0c02161ecfc2f40a0837926efac5376bc6fd6d3.tar.xz linux-dev-a0c02161ecfc2f40a0837926efac5376bc6fd6d3.zip | |
net: dsa: variable number of ports
Change the ports[DSA_MAX_PORTS] array of the dsa_switch structure for a
zero-length array, allocated at the same time as the dsa_switch
structure itself. A dsa_switch_alloc() helper is provided for that.
This commit brings no functional change yet since we pass DSA_MAX_PORTS
as the number of ports for the moment. Future patches can update the DSA
drivers separately to support dynamic number of ports.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 92fd795e9573..24e1d935ae68 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -190,8 +190,11 @@ struct dsa_switch { u32 cpu_port_mask; u32 enabled_port_mask; u32 phys_mii_mask; - struct dsa_port ports[DSA_MAX_PORTS]; struct mii_bus *slave_mii_bus; + + /* Dynamically allocated ports, keep last */ + size_t num_ports; + struct dsa_port ports[]; }; static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p) @@ -386,6 +389,7 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst) return dst->rcv != NULL; } +struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n); void dsa_unregister_switch(struct dsa_switch *ds); int dsa_register_switch(struct dsa_switch *ds, struct device *dev); #ifdef CONFIG_PM_SLEEP |