diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-07-19 19:42:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-19 19:42:02 -0700 |
| commit | 5e31c7019f08e85d5c285befe30620f7291b4ad3 (patch) | |
| tree | 25edd602c203442ec3fe5f74cb290b692742149f /net/Makefile | |
| parent | kernel/trace/bpf_trace.c: work around gcc-4.4.4 anon union initialization bug (diff) | |
| parent | net: dsa: mv88e6xxx: add support for DSA ageing time (diff) | |
| download | linux-dev-5e31c7019f08e85d5c285befe30620f7291b4ad3.tar.xz linux-dev-5e31c7019f08e85d5c285befe30620f7291b4ad3.zip | |
Merge branch 'dsa-mv88e6xxx-g2-cleanup-stp'
Vivien Didelot says:
====================
net: dsa: mv88e6xxx: Global2 cleanup and STP
The Marvell switches registers are organized in distinct internal SMI
devices, such as PHY, Port, Global 1 or Global 2 registers sets.
Since not all chips support every registers sets or have slightly
differences in them (such as old 88E6060 or new 88E6390 likely to be
supported soon), make the setup code clearer now by removing a few
family checks and adding flags to describe the Global 2 registers map.
This patchset enables basic STP support and bridging on most chips when
getting rid of a few inconsistencies in chip descriptions (patch 1) and
add bridge Ageing Time support to DSA and the mv88e6xxx driver.
Changes v2 -> v3:
- rename mv88e6xxx_update_write to mv88e6xxx_update
- set fastest ageing time in use in the chip for multiple bridges,
tested with a few printk
Changes v1 -> v2:
- add a write helper for pointer-data Update registers
- add ageing time support
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions