Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp312534ybh; Sun, 12 Jul 2020 07:11:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDm8FkI7/iAQWt7+Pm44mVeHiOP3w4R6UrlHMMnN+c6bNWt3mHECwE5pQ7IXlmIXC86g0H X-Received: by 2002:a17:906:da0f:: with SMTP id fi15mr68054655ejb.237.1594563068539; Sun, 12 Jul 2020 07:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594563068; cv=none; d=google.com; s=arc-20160816; b=ydPbKi98L/SLa3XDPRrjmPB9lVxQAROyF95jV2KesQnAAcfX1BTWB2H0HmHhKSzfrA vAErhEomR7oH82HAd24gVWNw3iWLwc93i/PpK8iFjoNCjFxUWYt7u2L8QiHrulhesEim 8Q/BYwbYQxmofrINMqgIorMkdhzpP9334xStoY2QfgbgaA/BiyOzsNAVaNVBL1pvrHK4 1C9eNfr9Xvz4+5tRRfoneJVZtcAlq9Nkq3mJUTiz8hRJPEoYj6T09kNGTO3ooP4w+IfQ bevzOo0/tO8uOi48fiAv7w0Jch0Ak1Lx0lNrcNxhbLXfi1zkLiGdA70Ils9T8s1iKPxc xv9A== 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=vDUAT1X4o0eb8j5AFeUTFCxqEplOTsGX+WDkzURWHq4NcaNPyZtdAmId+JkMbxWWFy /OBGf79HJ7PaTrK05UH2vNXwdRIJTKiZ4q5ZFor7Y1bLIy0bxAxs+Oa1kFU5doIJEpO/ eQIPwjPeA4Lv7HrodsL/a4CtuCUJgGdYXWsYp97NUzUJcjR0Fi68BELIVNi3Q1zhMKFV O7LYp8642t3hlCW0zqYnshCMqK5qu48iVaFT+oVTjnfDNI/gOuPxHQOXEGbT5fviQbcm 3igjq7fTCTklFgZZCq+tMswsVAadbqZm5BjtAmHoZmzfiLfolCQEc/w5vob2AgtsnNoi jHfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=b35E22jH; 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 a25si8009647edn.30.2020.07.12.07.10.46; Sun, 12 Jul 2020 07:11:08 -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=b35E22jH; 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 S1729183AbgGLOKH (ORCPT + 99 others); Sun, 12 Jul 2020 10:10:07 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:47180 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729115AbgGLOJx (ORCPT ); Sun, 12 Jul 2020 10:09:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594562993; x=1626098993; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HVKMV+YoS0rvNMp387sg/5WAHdCOziofqNB5E+Ov/pE=; b=b35E22jHoeE5ASVtLhSEsP6qWZ3fewmOBpjFF8VgwQqCzDMYdlFGem86 6frD7ofIL+0B4psaU9uPbkdINcg/OXCiyVOIjwidWR2Ez9yPl8GQBdOnn Wa+oPCQ5Jm46ivRxZ+cdUqCB5WLzTvp8nitNaHpT7DyZq0W8582tw3gZV J3HV8yoM7lkv+B16YrgaTwm+Q7fgoQKvwPc33wOs1uP1AclzKN+tCw0Q3 AGq1ah8tZK2in7p0cdzwFMCG9bBOa4NKnAEaPF9w/2yIUU2I5CF1rJDCz wexYIQLuM4p7vfAK67eo+c6JEfhUc74vKh5aG0NoYChXXc7M8SFaSMKgu w==; IronPort-SDR: DqZ9wFGs/fl5qkuIbOU/0OU9ZQSs+sdM3mmDL2AM9MUZSJ0WcKxuq+fmwjbMV1hRBTBfwrpQpL ylGgqJ+OapoMV/p7ILVrJay26K3+nsW3k3qF7xjlKYWP9SR71Eb0tv7mrsoWBmM4PwfK+x40b1 Ka90LslqQiHk8uKKH0i6oEf3glRzdfILIl8a+AaOfd3bF4ZLINzkM2ZtkSwMnVH8FuKBRfN45u X+D9oxKg+MWINTy/WrgDoGGuZ0p2fkzCnlR18fMireYjkacWpbnQay2gYN0rEd6aylVLHYplht mkM= X-IronPort-AV: E=Sophos;i="5.75,343,1589266800"; d="scan'208";a="82792155" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 12 Jul 2020 07:09:52 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) 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; Sun, 12 Jul 2020 07:09:52 -0700 Received: from soft-dev3.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Sun, 12 Jul 2020 07:09:20 -0700 From: Horatiu Vultur To: , , , , , , , , , , CC: Horatiu Vultur Subject: [PATCH net-next v3 11/12] bridge: mrp: Extend br_mrp_fill_info Date: Sun, 12 Jul 2020 16:05:55 +0200 Message-ID: <20200712140556.1758725-12-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200712140556.1758725-1-horatiu.vultur@microchip.com> References: <20200712140556.1758725-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