From: David S. Miller Date: Sat, 13 May 2023 16:06:38 +0000 (+0100) Subject: Merge branch 'dsa-rzn1-a5psw-stp' X-Git-Tag: v6.6.7~2829^2~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=843eb679d831130c381aaf1ec3bfb9206921cc62;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'dsa-rzn1-a5psw-stp' Alexis Lothoré says: ==================== net: dsa: rzn1-a5psw: fix STP states handling This small series fixes STP support and while adding a new function to enable/disable learning, use that to disable learning on standalone ports at switch setup as reported by Vladimir Oltean. This series was initially submitted on net-next by Clement Leger, but some career evolutions has made him hand me over those topics. Also, this new revision is submitted on net instead of net-next for V1 based on Vladimir Oltean's suggestion Changes since v2: - fix commit split by moving A5PSW_MGMT_CFG_ENABLE in relevant commit - fix reverse christmas tree ordering in a5psw_port_stp_state_set Changes since v1: - fix typos in commit messages and doc - re-split STP states handling commit - add Fixes: tag and new Signed-off-by - submit series as fix on net instead of net-next - split learning and blocking setting functions - remove unused define A5PSW_PORT_ENA_TX_SHIFT - add boolean for tx/rx enabled for clarity ==================== Signed-off-by: David S. Miller --- 843eb679d831130c381aaf1ec3bfb9206921cc62