Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1274169ybt; Thu, 9 Jul 2020 03:03:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGxtJB768c2DgRUZ0tlloB1CREMgtvUVfDLbb2pY3x7IaawkUNyZzB5zJ0T2kGP7qgsDuq X-Received: by 2002:a05:6402:b6c:: with SMTP id cb12mr71816613edb.116.1594289017783; Thu, 09 Jul 2020 03:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594289017; cv=none; d=google.com; s=arc-20160816; b=qEjzMhG6yQLxZVPIdGTl9OOTs+G7jbF4jvSDW2XNUowO3bTpF4MlJxluwIFHt+/Ny9 3rYZMPo+/9ru6sx5bZnUNfbAxiU8GJmqjUDmjMNElCL7TX+r8qZeitEj2cgA4LFg60TR +zDrXK49TMppFjeJRSE+72SIbHvsGywDc4hAlzaNe24Un+udTuJO9qurWOF0LlrnRXxO CHgv2mkkISi1szguIelqSG1OYTALTq+mXrruWbKAGvj+nmCQLPaaX7UCcWj7HPkeyDm2 eCG9tw9KTCCy6BXPRc6paau9JpYlURjvdO5kGmOTLQsDUbkxiwdtWBQP8EKJ0o/7l0y6 xekw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:dkim-signature; bh=WYOVO+KnirbZgqOoSLv0gAGSMC7E6YDHM+etn4CnU3M=; b=GF8x79Sz6+uZsNSdXEiqiWIJGwW2+UixITQsR2zC1Ehxj74OIlzhVK6lL6kRCz1RJA SFGFIKxsHbfUVG3gcU6zMnb2xMe275rCVvkPvg9mH1zRkWK4jUbOqjLs5QGx68yi9x4+ Db87brCKelRDY68REoFZ2rodmkua9UNWCBX9+09PREx3Dk9WJUW4aCK75W36eoVmb88q K7Eq0pFD2CnLfO7kls7S2+lq7/5i+54tmLS+iREv5Ri8+//iwC73AWdsIj8IEx5HnBhy AeicWfL1pFKlygGlUArd6pGlNk8pcZ6/3rl6Bpw5lKWIorhVb6sEMrNeVWpM3N4XdWqH RXrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=KkRQbFaj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ci27si1642246ejc.179.2020.07.09.03.03.14; Thu, 09 Jul 2020 03:03:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=KkRQbFaj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726932AbgGIKC3 (ORCPT + 99 others); Thu, 9 Jul 2020 06:02:29 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:27704 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726912AbgGIKCV (ORCPT ); Thu, 9 Jul 2020 06:02:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594288941; x=1625824941; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HVKMV+YoS0rvNMp387sg/5WAHdCOziofqNB5E+Ov/pE=; b=KkRQbFajfqunAz1iTys/QeyM2bSfqbyrteohvk3Gye5++o/zWVC0efEz Hb1h88UmSlZYTXiRAT89TvQ7mtGJWFojZ4X58W7MPS/+FV1OGRmu/NKSV GWzj3yOI2l3aabznH/PGoT83YJyY0Od/hbnn6DX/yrTZJFt0J/dGOoCbY eCiJfPNmO2MD0RASgQnR5CB7Lmc/CFYykfv1wQUrLa7ZLx3cWzLS0aiZP XvHjLH+1WssUtHpty6v7+n04vyg9IuKK8niFfcBeJcdFnU5LvgNWB1EdR POFPIK0d49lfMZRFdrJEcuk37f/juXUh/y3ZpecI9pIpZZCnMCw/YTFef Q==; IronPort-SDR: 0R64jUyP9lImfUnDs4AM83I2htUx8WdM0frdrOkSMhz81vvKurRtVMf78uTo3oL11t+GdFiOa4 qkRHMjnLN2LyP0kcoU6QJoScU7Pk8QmPGheL4h0XO9ilkFcJHi4i2H5l4SRazdNrzV8lYC+MKv ik+CNafWJY5b/1WFQOb4jiKsy8InZOAXy0BbC5EmBqV2EzUMLOiZOMJ1cIjG92C6zc4mIPS7Tt 7iSTZYc8FgCj45bXujk9z8/G0UzXSW7ZuSwNd10dLfEggznkyYzsgSOzd50uqcnAUTcI+49rGm DG4= X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208";a="82397814" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jul 2020 03:02:21 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 9 Jul 2020 03:02:13 -0700 Received: from soft-dev3.localdomain (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Thu, 9 Jul 2020 03:02:10 -0700 From: Horatiu Vultur To: , , , , , , , , , , CC: Horatiu Vultur Subject: [PATCH net-next v2 11/12] bridge: mrp: Extend br_mrp_fill_info Date: Thu, 9 Jul 2020 12:00:39 +0200 Message-ID: <20200709100040.554623-12-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709100040.554623-1-horatiu.vultur@microchip.com> References: <20200709100040.554623-1-horatiu.vultur@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch extends the function br_mrp_fill_info to return also the status for the interconnect ring. Signed-off-by: Horatiu Vultur --- net/bridge/br_mrp_netlink.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c index a006e0771e8d3..2a2fdf3500c5b 100644 --- a/net/bridge/br_mrp_netlink.c +++ b/net/bridge/br_mrp_netlink.c @@ -474,6 +474,11 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) p->dev->ifindex)) goto nla_put_failure; + p = rcu_dereference(mrp->i_port); + if (p && nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_I_IFINDEX, + p->dev->ifindex)) + goto nla_put_failure; + if (nla_put_u16(skb, IFLA_BRIDGE_MRP_INFO_PRIO, mrp->prio)) goto nla_put_failure; @@ -493,6 +498,19 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) mrp->test_monitor)) goto nla_put_failure; + if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_STATE, + mrp->in_state)) + goto nla_put_failure; + if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_ROLE, + mrp->in_role)) + goto nla_put_failure; + if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_TEST_INTERVAL, + mrp->in_test_interval)) + goto nla_put_failure; + if (nla_put_u32(skb, IFLA_BRIDGE_MRP_INFO_IN_TEST_MAX_MISS, + mrp->in_test_max_miss)) + goto nla_put_failure; + nla_nest_end(skb, tb); } nla_nest_end(skb, mrp_tb); -- 2.27.0