diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-08-06 01:44:05 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-09 22:48:09 -0700 |
| commit | 368b1d9c10acf99a855961ae6a1430591ee55f03 (patch) | |
| tree | 1f0b44291e134fbe05ae318a4bfe5206327fa94f /drivers/net/dsa/mv88e6xxx.h | |
| parent | net: dsa: add support for switchdev FDB objects (diff) | |
| download | linux-dev-368b1d9c10acf99a855961ae6a1430591ee55f03.tar.xz linux-dev-368b1d9c10acf99a855961ae6a1430591ee55f03.zip | |
net: dsa: mv88e6xxx: extend fid mask
The driver currently manages one FID per port (or bridge group), with a
mask of DSA_MAX_PORTS bits, where 0 means that the FID is in use.
The Marvell 88E6xxx switches support up to 4094 FIDs (from 1 to 0xfff;
FID 0 means that multiple address databases are not being used).
This patch changes the fid_mask for an fid_bitmap of 4096 bits.
>From now on, FIDs 1 to num_ports are reserved for non-bridged ports and
bridge groups (a bridge group gets the FID of its first member). The
remaining bits will be reserved for VLAN entries.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6xxx.h')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h index 78e37226a37d..33dcc16ed294 100644 --- a/drivers/net/dsa/mv88e6xxx.h +++ b/drivers/net/dsa/mv88e6xxx.h @@ -11,6 +11,8 @@ #ifndef __MV88E6XXX_H #define __MV88E6XXX_H +#include <linux/if_vlan.h> + #ifndef UINT64_MAX #define UINT64_MAX (u64)(~((u64)0)) #endif @@ -347,9 +349,9 @@ struct mv88e6xxx_priv_state { /* hw bridging */ - u32 fid_mask; - u8 fid[DSA_MAX_PORTS]; - u16 bridge_mask[DSA_MAX_PORTS]; + DECLARE_BITMAP(fid_bitmap, VLAN_N_VID); /* FIDs 1 to 4095 available */ + u16 fid[DSA_MAX_PORTS]; /* per (non-bridged) port FID */ + u16 bridge_mask[DSA_MAX_PORTS]; /* br groups (indexed by FID) */ unsigned long port_state_update_mask; u8 port_state[DSA_MAX_PORTS]; |