From: David S. Miller Date: Wed, 25 Feb 2015 22:04:15 +0000 (-0500) Subject: Merge branch 'sf2_hwbridge' X-Git-Tag: Ubuntu-5.0.0-8.9~9586^2~398 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bb66be1c549a0760500cfad404b3d79a136d0e44;p=mirror_ubuntu-disco-kernel.git Merge branch 'sf2_hwbridge' Florian Fainelli says: ==================== net: dsa: integration with SWITCHDEV for HW bridging This patch set provides the DSA and SWITCHDEV integration bits together and modifies the bcm_sf2 driver accordingly such that it works properly with HW bridging. Changes in v3: - add back the null pointer check in dsa_slave_br_port_mask from Guenter - slightly rework patch 1 commit message not to mention the function name we add in patch 2 Changes in v2: - avoid a race condition in how DSA network devices are created, patch from Guenter Roeck - provide a consistent and work STP state once a port leaves the bridge - retain a bridge device pointer to properly flag port/bridge membership - properly flush the ARL (Address Resolution Logic) in bcm_sf2.c - properly retain port membership when individually bringing devices up/down while they are members of a bridge We discussed on the mailing-list the possibility of standardizing a "fdb_flush" operation for DSA switch drivers, looking at the Marvell and Broadcom switches, I am not convinced this is practical or diserable as the terminologies vary here, but there is nothing preventing us from doing it later. Many thanks to Guenter and Andrew for both testing and providing feedback. ==================== Signed-off-by: David S. Miller --- bb66be1c549a0760500cfad404b3d79a136d0e44