From patchwork Tue Dec 14 13:45:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kanzenbach X-Patchwork-Id: 12676013 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3A81C433EF for ; Tue, 14 Dec 2021 13:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234541AbhLNNpj (ORCPT ); Tue, 14 Dec 2021 08:45:39 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:41874 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234537AbhLNNph (ORCPT ); Tue, 14 Dec 2021 08:45:37 -0500 From: Kurt Kanzenbach DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1639489535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dtBv0pCkOaDpa1ktY12/an6AVoU44vB4b5jZF67iQuA=; b=IGM0UuBfcTAslINHF00Rv9nT5k1KeA1SxHn/YwOpwUbmDZBkR9ttVTByoL5ywtlAqlqiyz 7gyHhhrVraMHPAxswP47YruGvs94Rm+QFFVIUVDl1MMyyAzYuEG84WCltyW1SQz+cryPBr 1b7Fm8MeW8rq+ktHyTjkG+IZTGoBc3sUUxNKR5AqkoY6jiFJ5BbqGSgT2X4fnS9EZrOTCv YrhvEXUk2fsbW01NW4tNEC3ww3RUDZ9TJW/FmuznGJRe3tpRcOC2MTI5ucF951ErV9tibj 1/gc6uv9UP8K1dGRUpjuicaZdvPnm+boRIFbMWqUfkXz65sVoB2uoVzW5Sik5A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1639489535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dtBv0pCkOaDpa1ktY12/an6AVoU44vB4b5jZF67iQuA=; b=xQdnos2B/6DYSIFykSgLWPadISD9J0nMzoGhUnXrVpJ76WcDziLo426FcmvhG2ibvx8KJS 17ytJx2UGubQJbAw== To: "David S. Miller" , Jakub Kicinski Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Richard Cochran , Kamil Alkhouri , netdev@vger.kernel.org, Kurt Kanzenbach Subject: [PATCH net-next v2 1/4] net: dsa: hellcreek: Fix insertion of static FDB entries Date: Tue, 14 Dec 2021 14:45:05 +0100 Message-Id: <20211214134508.57806-2-kurt@linutronix.de> In-Reply-To: <20211214134508.57806-1-kurt@linutronix.de> References: <20211214134508.57806-1-kurt@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The insertion of static FDB entries ignores the pass_blocked bit. That bit is evaluated with regards to STP. Add the missing functionality. Fixes: e4b27ebc780f ("net: dsa: Add DSA driver for Hirschmann Hellcreek switches") Signed-off-by: Kurt Kanzenbach Reviewed-by: Vladimir Oltean --- drivers/net/dsa/hirschmann/hellcreek.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index 9eecb7529573..c4f840b20adf 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -711,8 +711,9 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek, u16 meta = 0; dev_dbg(hellcreek->dev, "Add static FDB entry: MAC=%pM, MASK=0x%02x, " - "OBT=%d, REPRIO_EN=%d, PRIO=%d\n", entry->mac, entry->portmask, - entry->is_obt, entry->reprio_en, entry->reprio_tc); + "OBT=%d, PASS_BLOCKED=%d, REPRIO_EN=%d, PRIO=%d\n", entry->mac, + entry->portmask, entry->is_obt, entry->pass_blocked, + entry->reprio_en, entry->reprio_tc); /* Add mac address */ hellcreek_write(hellcreek, entry->mac[1] | (entry->mac[0] << 8), HR_FDBWDH); @@ -723,6 +724,8 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek, meta |= entry->portmask << HR_FDBWRM0_PORTMASK_SHIFT; if (entry->is_obt) meta |= HR_FDBWRM0_OBT; + if (entry->pass_blocked) + meta |= HR_FDBWRM0_PASS_BLOCKED; if (entry->reprio_en) { meta |= HR_FDBWRM0_REPRIO_EN; meta |= entry->reprio_tc << HR_FDBWRM0_REPRIO_TC_SHIFT; From patchwork Tue Dec 14 13:45:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kanzenbach X-Patchwork-Id: 12676015 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82CDBC4332F for ; Tue, 14 Dec 2021 13:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234546AbhLNNpk (ORCPT ); Tue, 14 Dec 2021 08:45:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234548AbhLNNpi (ORCPT ); Tue, 14 Dec 2021 08:45:38 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59809C061574 for ; Tue, 14 Dec 2021 05:45:38 -0800 (PST) From: Kurt Kanzenbach DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1639489537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=26GwEMF7AGneK4l0UHeYTB845ctWzrnTU2d7an7yp9o=; b=bYrFwUt0cosW/ISGRM0QzXWaPDUcnQEMHgJgR0JYUGMdvKZLMfv0jyINxikqsdcYwcFnkE pcRUBRidvOhSpTevCN2cSECFsll+rPHBYuZe/rbmEEViJ3Wcp9LYIi908nk413OJz403X8 /SngImZsCKXyfv0JPjAfmTQ6O5nu1yFcO3c82jhbfHZguTY2ZqwREW5hCmgM+Pu6BcnHBR ZQXkfT7HqKF7aRHEgwGSHiWITvC2DONjRaiKdgezx30EB/fH7h1eFnECtxMup+oQdMhu2c hY6i9S2aui1WAgrhTB6q2t9OMhebxjEuEmNvxMmev4690OnovJVvG07bMfN19A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1639489537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=26GwEMF7AGneK4l0UHeYTB845ctWzrnTU2d7an7yp9o=; b=zNHyntp44BbWYLC4cdzF9NKQ6MGYu1dEIj6qBJfrngGqGrWg/aFAeMKQLrbogHDaj+E7n+ iiTxiS5PgY8BExAw== To: "David S. Miller" , Jakub Kicinski Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Richard Cochran , Kamil Alkhouri , netdev@vger.kernel.org, Kurt Kanzenbach Subject: [PATCH net-next v2 2/4] net: dsa: hellcreek: Add STP forwarding rule Date: Tue, 14 Dec 2021 14:45:06 +0100 Message-Id: <20211214134508.57806-3-kurt@linutronix.de> In-Reply-To: <20211214134508.57806-1-kurt@linutronix.de> References: <20211214134508.57806-1-kurt@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Treat STP as management traffic. STP traffic is designated for the CPU port only. In addition, STP traffic has to pass blocked ports. Fixes: e4b27ebc780f ("net: dsa: Add DSA driver for Hirschmann Hellcreek switches") Signed-off-by: Kurt Kanzenbach Reviewed-by: Vladimir Oltean --- drivers/net/dsa/hirschmann/hellcreek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index c4f840b20adf..17d3a4a3582e 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -1075,6 +1075,17 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, }; + static struct hellcreek_fdb_entry stp = { + /* MAC: 01-80-C2-00-00-00 */ + .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }, + .portmask = 0x03, /* Management ports */ + .age = 0, + .is_obt = 0, + .pass_blocked = 1, + .is_static = 1, + .reprio_tc = 6, + .reprio_en = 1, + }; int ret; mutex_lock(&hellcreek->reg_lock); @@ -1082,6 +1093,9 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) if (ret) goto out; ret = __hellcreek_fdb_add(hellcreek, &p2p); + if (ret) + goto out; + ret = __hellcreek_fdb_add(hellcreek, &stp); out: mutex_unlock(&hellcreek->reg_lock); From patchwork Tue Dec 14 13:45:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kanzenbach X-Patchwork-Id: 12676017 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BA56C433FE for ; Tue, 14 Dec 2021 13:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234542AbhLNNpk (ORCPT ); Tue, 14 Dec 2021 08:45:40 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:41898 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234546AbhLNNpi (ORCPT ); Tue, 14 Dec 2021 08:45:38 -0500 From: Kurt Kanzenbach DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1639489537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Up+YJsrenXH2pWJjQWcSJ+3utOp2O9a7aLTUvqCnEwc=; b=Ci2zbwaLelSJkNT2VCy1kGPk0RoACJwAAE5eckpabE3V2e94wB+aos4uz3VmOkCDgVq7Nb 7WAstHtZ5stT92M+RT6A+xumAuvdvmTsMMU2DbYRR86E3pTgGQ31JUX8YxDxtq40BLBaYc w8peJ8VuJ7CvdZJWGD7dkPn7aZE0rtZgUkrOfhxQlv1lpTQAx/VSSFkxD7BQ2BSzsX/UTO KcTJIyfQQsOt934fpV/up+WGPFGwW11ZxI7Ij7UY0EH2YTKnYG66RH4rtLUOUHJ/vwGVdt 2PPdTH+7Cc1Qu8MBY3Qmz8pOtrXwNfLtmIFiyNx2dFVR6zMych7H0cwdxzKVpg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1639489537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Up+YJsrenXH2pWJjQWcSJ+3utOp2O9a7aLTUvqCnEwc=; b=71Dw59q4nwgTF8+l3idC7A9nEAYqzJgKESrfYAi4QX91Gw6IPnhzjdr2bNoSdr1cuF9BQ/ Rt6qoH5vC84l3zDg== To: "David S. Miller" , Jakub Kicinski Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Richard Cochran , Kamil Alkhouri , netdev@vger.kernel.org, Kurt Kanzenbach Subject: [PATCH net-next v2 3/4] net: dsa: hellcreek: Allow PTP P2P measurements on blocked ports Date: Tue, 14 Dec 2021 14:45:07 +0100 Message-Id: <20211214134508.57806-4-kurt@linutronix.de> In-Reply-To: <20211214134508.57806-1-kurt@linutronix.de> References: <20211214134508.57806-1-kurt@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Allow PTP peer delay measurements on blocked ports by STP. In case of topology changes the PTP stack can directly start with the correct delays. Fixes: ddd56dfe52c9 ("net: dsa: hellcreek: Add PTP clock support") Signed-off-by: Kurt Kanzenbach Reviewed-by: Vladimir Oltean --- drivers/net/dsa/hirschmann/hellcreek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index 17d3a4a3582e..cc0e4465bbbf 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -1070,7 +1070,7 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .portmask = 0x03, /* Management ports */ .age = 0, .is_obt = 0, - .pass_blocked = 0, + .pass_blocked = 1, .is_static = 1, .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, From patchwork Tue Dec 14 13:45:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kanzenbach X-Patchwork-Id: 12676019 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5190C43217 for ; Tue, 14 Dec 2021 13:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234548AbhLNNpl (ORCPT ); Tue, 14 Dec 2021 08:45:41 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:41910 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234547AbhLNNpj (ORCPT ); Tue, 14 Dec 2021 08:45:39 -0500 From: Kurt Kanzenbach DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1639489537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7c1q737MIaJzZBoq6YffHEZqPideAxTTceFWstseay4=; b=U0RCk0L4warEcKiIuvlaGb6UHl+Mvx2N6tQ2ghkwrB+obW7ht2dFeFlAB7/jkKeGs/weDc RG/vl2VXiYoJMjw8htI3s8FhdWsa51pg41pBdGVo9uyBucP2ekZcaZ61nm7FsJGeDfsbPR noSpLQHjXQJnjbk6ydQD2BEat8ELOCkJpX8xD0Nj3eij6LncwLPCGPGdXL8EnrbOEj+lv4 T6ZzH0ZPN7K2KaelQx7OdNh5y9UlXPwPgxDj1SAmitPKKS6l8zrZ9kMnt9pcN8lBVfMIkP TVXlSG15tlthksiSvrlLrOlgLl4/yLo3JX8NiCDRbVCx0zEmEjfr3StNbysqMQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1639489537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7c1q737MIaJzZBoq6YffHEZqPideAxTTceFWstseay4=; b=yUTvughUIAtrgnH9HgNIwvabJHMZFga6pemZ8KPAVb7yrZ/rDKym7A/uLmq9n+ggkJgopr E8D0K9XWxrcenmDw== To: "David S. Miller" , Jakub Kicinski Cc: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Richard Cochran , Kamil Alkhouri , netdev@vger.kernel.org, Kurt Kanzenbach Subject: [PATCH net-next v2 4/4] net: dsa: hellcreek: Add missing PTP via UDP rules Date: Tue, 14 Dec 2021 14:45:08 +0100 Message-Id: <20211214134508.57806-5-kurt@linutronix.de> In-Reply-To: <20211214134508.57806-1-kurt@linutronix.de> References: <20211214134508.57806-1-kurt@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The switch supports PTP for UDP transport too. Therefore, add the missing static FDB entries to ensure correct forwarding of these packets. Fixes: ddd56dfe52c9 ("net: dsa: hellcreek: Add PTP clock support") Signed-off-by: Kurt Kanzenbach --- drivers/net/dsa/hirschmann/hellcreek.c | 64 ++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index cc0e4465bbbf..726f267cb228 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -1053,7 +1053,7 @@ static void hellcreek_setup_tc_identity_mapping(struct hellcreek *hellcreek) static int hellcreek_setup_fdb(struct hellcreek *hellcreek) { - static struct hellcreek_fdb_entry ptp = { + static struct hellcreek_fdb_entry l2_ptp = { /* MAC: 01-1B-19-00-00-00 */ .mac = { 0x01, 0x1b, 0x19, 0x00, 0x00, 0x00 }, .portmask = 0x03, /* Management ports */ @@ -1064,7 +1064,29 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, }; - static struct hellcreek_fdb_entry p2p = { + static struct hellcreek_fdb_entry udp4_ptp = { + /* MAC: 01-00-5E-00-01-81 */ + .mac = { 0x01, 0x00, 0x5e, 0x00, 0x01, 0x81 }, + .portmask = 0x03, /* Management ports */ + .age = 0, + .is_obt = 0, + .pass_blocked = 0, + .is_static = 1, + .reprio_tc = 6, + .reprio_en = 1, + }; + static struct hellcreek_fdb_entry udp6_ptp = { + /* MAC: 33-33-00-00-01-81 */ + .mac = { 0x33, 0x33, 0x00, 0x00, 0x01, 0x81 }, + .portmask = 0x03, /* Management ports */ + .age = 0, + .is_obt = 0, + .pass_blocked = 0, + .is_static = 1, + .reprio_tc = 6, + .reprio_en = 1, + }; + static struct hellcreek_fdb_entry l2_p2p = { /* MAC: 01-80-C2-00-00-0E */ .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e }, .portmask = 0x03, /* Management ports */ @@ -1075,6 +1097,28 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, }; + static struct hellcreek_fdb_entry udp4_p2p = { + /* MAC: 01-00-5E-00-00-6B */ + .mac = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x6b }, + .portmask = 0x03, /* Management ports */ + .age = 0, + .is_obt = 0, + .pass_blocked = 1, + .is_static = 1, + .reprio_tc = 6, + .reprio_en = 1, + }; + static struct hellcreek_fdb_entry udp6_p2p = { + /* MAC: 33-33-00-00-00-6B */ + .mac = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x6b }, + .portmask = 0x03, /* Management ports */ + .age = 0, + .is_obt = 0, + .pass_blocked = 1, + .is_static = 1, + .reprio_tc = 6, + .reprio_en = 1, + }; static struct hellcreek_fdb_entry stp = { /* MAC: 01-80-C2-00-00-00 */ .mac = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }, @@ -1089,10 +1133,22 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) int ret; mutex_lock(&hellcreek->reg_lock); - ret = __hellcreek_fdb_add(hellcreek, &ptp); + ret = __hellcreek_fdb_add(hellcreek, &l2_ptp); + if (ret) + goto out; + ret = __hellcreek_fdb_add(hellcreek, &udp4_ptp); + if (ret) + goto out; + ret = __hellcreek_fdb_add(hellcreek, &udp6_ptp); + if (ret) + goto out; + ret = __hellcreek_fdb_add(hellcreek, &l2_p2p); + if (ret) + goto out; + ret = __hellcreek_fdb_add(hellcreek, &udp4_p2p); if (ret) goto out; - ret = __hellcreek_fdb_add(hellcreek, &p2p); + ret = __hellcreek_fdb_add(hellcreek, &udp6_p2p); if (ret) goto out; ret = __hellcreek_fdb_add(hellcreek, &stp);