From e8ff54cb678b5f18bf3ce8aa959820ef144e687d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 6 Mar 2024 10:51:19 +0100 Subject: [PATCH] Revert "confd: check return value on failure to read pvid from a bridge-port" This reverts commit f5e37bba58a1fc3a2ef180b3850035df367d2709 because it causes a regression in setting up VLAN filtering bridges. The bridge itself, e.g., br0 currently does not have a bridge-port context at the same time as it being bridge. The model does not account for that and thus srx_get_int() for the br0 PVID will always fail. Reverting this commit allows br0 to be tagged member in all VLANs by default, for now. Signed-off-by: Joachim Wiberg --- src/confd/src/ietf-interfaces.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/confd/src/ietf-interfaces.c b/src/confd/src/ietf-interfaces.c index e0224398..1813d445 100644 --- a/src/confd/src/ietf-interfaces.c +++ b/src/confd/src/ietf-interfaces.c @@ -736,11 +736,9 @@ static int netdag_gen_ethtool(struct dagger *net, struct lyd_node *cif, struct l static int bridge_diff_vlan_port(struct dagger *net, FILE *br, const char *brname, int vid, const char *brport, int tagged, enum lydx_op op) { - int err, pvid = 0; + int pvid = 0; - err = srx_get_int(net->session, &pvid, SR_UINT16_T, IF_XPATH "[name='%s']/bridge-port/pvid", brport); - if (err) - return err; + srx_get_int(net->session, &pvid, SR_UINT16_T, IF_XPATH "[name='%s']/bridge-port/pvid", brport); if (op != LYDX_OP_CREATE) { fprintf(br, "vlan del vid %d dev %s\n", vid, brport);