From patchwork Tue Oct 6 12:11:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 526719 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 91718140D68 for ; Tue, 6 Oct 2015 23:12:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275AbbJFMM2 (ORCPT ); Tue, 6 Oct 2015 08:12:28 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:34149 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbbJFMM0 (ORCPT ); Tue, 6 Oct 2015 08:12:26 -0400 Received: by wicfx3 with SMTP id fx3so163072652wic.1 for ; Tue, 06 Oct 2015 05:12:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gNM4c8gaCeOz+wKYw+t8Xh3fsBNfPYWD5v+7gYNceTU=; b=Gw+kojRGRH0adqKmAxZPpma6HoGFfqS8003q3GoEWKBUp/d4YBFDFp+8enhU0+oBGA PGVlfIae+45ludIbxGxoLDgDW9sqsl2xEGIjFM+MP3y30efj0GRITXRQ++yoc3OW+V88 TpJQtMFM9angYSUo235wKxZApNK7aM2UWSBwjdiq/Memhrj4Dnrth3BS+RiHZftQXc1s qKRPRW8qLAT9axyMnAn+JvxUt5kWPNE9bGgN0LoWk0x2pWufpXvxrWHYwgqUJEhYrh9r lX0lgXETpqOPG8u4zwJsaBTa1flVjNaGgwn5Tixixt9g4hKc6axDL6eHWIELg9hJrnCw 3HjQ== X-Gm-Message-State: ALoCoQkMwM/rPkRt50nsasR30pooCXKxsR0lE7yBUwkheNlGHLTQffKJI4cIz/gmlryONFSOD7PD X-Received: by 10.194.121.232 with SMTP id ln8mr43203652wjb.76.1444133545170; Tue, 06 Oct 2015 05:12:25 -0700 (PDT) Received: from debil.localdomain (ip4-62-4-104-109.cust.nbox.cz. [62.4.104.109]) by smtp.gmail.com with ESMTPSA id r6sm4702876wia.0.2015.10.06.05.12.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 05:12:24 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, davem@davemloft.net, stephen@networkplumber.org, bridge@lists.linux-foundation.org, shm@cumulusnetworks.com, Nikolay Aleksandrov Subject: [PATCH net-next 3/8] bridge: netlink: export port's designated cost and port Date: Tue, 6 Oct 2015 14:11:57 +0200 Message-Id: <1444133522-16907-4-git-send-email-razor@blackwall.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444133522-16907-1-git-send-email-razor@blackwall.org> References: <1444133522-16907-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nikolay Aleksandrov Add IFLA_BRPORT_DESIGNATED_(COST|PORT) to allow getting the port's designated cost and port respectively via netlink. Signed-off-by: Nikolay Aleksandrov --- include/uapi/linux/if_link.h | 2 ++ net/bridge/br_netlink.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index e891c32c9993..837caf940135 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -294,6 +294,8 @@ enum { IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */ IFLA_BRPORT_ROOT_ID, /* designated root */ IFLA_BRPORT_BRIDGE_ID, /* designated bridge */ + IFLA_BRPORT_DESIGNATED_PORT, + IFLA_BRPORT_DESIGNATED_COST, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index c3e0b73d660d..678d22747044 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -129,6 +129,8 @@ static inline size_t br_port_info_size(void) + nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */ + nla_total_size(sizeof(struct ifla_bridge_id)) /* IFLA_BRPORT_ROOT_ID */ + nla_total_size(sizeof(struct ifla_bridge_id)) /* IFLA_BRPORT_BRIDGE_ID */ + + nla_total_size(sizeof(u16)) /* IFLA_BRPORT_DESIGNATED_PORT */ + + nla_total_size(sizeof(u16)) /* IFLA_BRPORT_DESIGNATED_COST */ + 0; } @@ -166,7 +168,9 @@ static int br_port_fill_attrs(struct sk_buff *skb, nla_put(skb, IFLA_BRPORT_ROOT_ID, sizeof(struct ifla_bridge_id), &p->designated_root) || nla_put(skb, IFLA_BRPORT_BRIDGE_ID, sizeof(struct ifla_bridge_id), - &p->designated_bridge)) + &p->designated_bridge) || + nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_PORT, p->designated_port) || + nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_COST, p->designated_cost)) return -EMSGSIZE; return 0;