Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp4351078ybt; Mon, 6 Jul 2020 02:22:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsDgD+iDPSqHpLunejp0nGBni/71sImieUJYSJ4VAykz3SNgg+Fz/DTLu/mPCixxU51loL X-Received: by 2002:a50:cd53:: with SMTP id d19mr55850104edj.300.1594027375339; Mon, 06 Jul 2020 02:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594027375; cv=none; d=google.com; s=arc-20160816; b=QF3Gq1vfiNXwyJEXJ4wPsOaIRvce7G1+2qRdK/BYejT2U8fNI2OqhzjMUvaOZHx9eh C0AOkYP6REqL7l3nZPZIVWyYMg383bYHPmCMUissEmatlhGq2mmhaeJCW3gHPg1e25ft y1jcNe/CNw3m1QVAfRvESnXez0Zm++0oLUE40cNtvW3UCnPVFNoqTuV7U5W2Q0TLBTGf 1PEQc2zc+XyHTbxKVJ1WrkMNsjeiRCNDhyLFa+dut8DwQNstPWCPpsKMYSxE+rPLAPwt h2YcRGrzUSZJoABh5oTpAgZ/wjCVxRkWkN8gFlLyl35EJHCP6L/G7MF4pVSFa47f+WEe Je9w== 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=ByE88Jo7cPxMByeA9jmndzPQX/bvQz0vneafRJiXpOCKdjfcLpTy2FgPkd5eqFNs81 OJa/J5pPnTMFKgR6+ov69QrE86RKOzyigiDobFcDtNSNFT7r6qW8G8TYqKCB0FZ3aGYP jlemYt3SOg2ogAysZk6GtiMLV4ciGoN7Ma49MCeERbSvtmX0UEnxeOCTWyrEOUlDIjLQ v00D5gwvRSuEos0oT7Dds2a29x7zV6fKWSZlMyCo6ceDy/pdG9UJhhfqM1512dS65/Ef gBOeTiQ16pO65azAZEw9X1J2UbYleNo8PHHIIerum2z2MVt0dtwmwLhg6UwylJmlAB8V 1T2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=Lw37nI5S; 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 f11si11893403ejq.283.2020.07.06.02.22.32; Mon, 06 Jul 2020 02:22:55 -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=Lw37nI5S; 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 S1728991AbgGFJVX (ORCPT + 99 others); Mon, 6 Jul 2020 05:21:23 -0400 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:16717 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728976AbgGFJVU (ORCPT ); Mon, 6 Jul 2020 05:21:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594027280; x=1625563280; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HVKMV+YoS0rvNMp387sg/5WAHdCOziofqNB5E+Ov/pE=; b=Lw37nI5SnVgqKxtcI5/MnBl3bWULGJpo4R5YKwxgVSFL36BmHK9oU0IW mROtexuVemQIXa0hSNpadKvoa4vH5NTH8p/V9jWnd26xy5dKGQmWsb4HF bCwhfvXe7zRCJZF8vC22XAm8+fQZbcTC38l1ew1hkF3XBPVn4qSIIPIKN RFZuEZfrcTh03isOHQKHCxEcVLn7ectyXLlcFZ+vuloQGb/WUvT4FAVMc tujW4WirXPdvaRWWGlO/B+HPR+UCtCM78k8NXalDBzTkblqFjImze9X9I g1SO3P3s2zeHg6npqjODLi1EiZUqyUlx2aVHdL7k9bbv2lh2rTHen9zn3 w==; IronPort-SDR: 9VmU2y4nvdke+9LxY4xe6886CYWVbAmcUdf99t3/EY6dPnsbumqxRxHalgF2vEmfxFx7cFPUtD Mz0yuAVWzxtsMpYOsKRPJhggZJ6kSjkRWddQOqufb8m0cbZf4Z7m/23DrzpUK8oCoh2QARAVU+ ORttA8ZAKcM7bH8w9exyAv6GGn1Ln7LtFkQXmNcqaLgSW17BCWAnxLVzjMAjV1eURuFesjQk5x i8/ilVncl6pAwiq+HQwJ9yKMowhWUcHsiNOniysT/34obtgbgqLgdaKNNX6k5599pWK/JwExH9 ON0= X-IronPort-AV: E=Sophos;i="5.75,318,1589266800"; d="scan'208";a="18109045" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2020 02:21:20 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Mon, 6 Jul 2020 02:21:19 -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; Mon, 6 Jul 2020 02:20:53 -0700 From: Horatiu Vultur To: , , , , , , , , , , CC: Horatiu Vultur Subject: [PATCH net-next 11/12] bridge: mrp: Extend br_mrp_fill_info Date: Mon, 6 Jul 2020 11:18:41 +0200 Message-ID: <20200706091842.3324565-12-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200706091842.3324565-1-horatiu.vultur@microchip.com> References: <20200706091842.3324565-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