From patchwork Tue Apr 16 13:15:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1086315 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="WsxCpOkU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44k5Ty1Pm9z9s71 for ; Tue, 16 Apr 2019 23:16:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729353AbfDPNQE (ORCPT ); Tue, 16 Apr 2019 09:16:04 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34843 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727030AbfDPNQE (ORCPT ); Tue, 16 Apr 2019 09:16:04 -0400 Received: by mail-wr1-f67.google.com with SMTP id w1so27042690wrp.2 for ; Tue, 16 Apr 2019 06:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AdSWbL1WHUhzYSOvkpZXCzCxGORDu84QZyVAcmvjbwk=; b=WsxCpOkUsHQu4Cnh0AfwOOuy/UZv7oZSR5310VmBUqAnvzfwnbI9IHtkVS4z2VR9r9 TCr9N1zk4wVe78+wnFOTqdASZdfy3rof9CnqAkjdbw71I/VMEULdfo3VvzLWrgFXDUL7 okmg8HE061PdyQB3J/YSx8dnZ+8iwsMGg78yA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AdSWbL1WHUhzYSOvkpZXCzCxGORDu84QZyVAcmvjbwk=; b=IqQVUPoon4y5rtRBiYDLT6sNP6wOa5RLTczO2HGw6eFCpUdDz4EdGfydpTIvBFxjVK c/kEFLUyjtUi3wlkRFoLXeh7qsyLmDm+HQlb6zCrQpffYIr/nPU2k694CuQtboddAteQ mNxjzBv7gcvxqRfY2Umu0jpJdEpUaDnm5bO0Mq4KEO2wTMhMBmaCtpSS4F02rQ+WYAwQ e0wQmjSvRd0RgQMzDpux8VIBYDuI94az/gBycg/RrkUqCizuQYsMmHJt1SpwUp9PSbUv GrE2GGNhYIBOfJJNz8XizH/Ac26IlumzcvPJoi1oqnqsJB+tBw78+gAK8v4kJ98Pu1Aj FE/Q== X-Gm-Message-State: APjAAAVJWOZRGmMEfKxcu8cg8MPf8sX6GVoMyyuHrpZKCV8DH9Laz8Az T3TriOMJbGPRPL6+gYlfbfAm19TTytM= X-Google-Smtp-Source: APXvYqxsNrOZClqzi7sgr2hHgLjxNgYuk9R8rxD+f34BLFAZ53eP7K34yRTe0I3YAFdEQLH6lAyUfQ== X-Received: by 2002:adf:c10e:: with SMTP id r14mr50693280wre.168.1555420562007; Tue, 16 Apr 2019 06:16:02 -0700 (PDT) Received: from localhost.localdomain ([93.152.141.58]) by smtp.gmail.com with ESMTPSA id c13sm1569809wrx.88.2019.04.16.06.16.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2019 06:16:01 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, Nikolay Aleksandrov Subject: [PATCH net] net: bridge: fix netlink export of vlan_stats_per_port option Date: Tue, 16 Apr 2019 16:15:56 +0300 Message-Id: <20190416131556.27109-1-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since the introduction of the vlan_stats_per_port option the netlink export of it has been broken since I made a typo and used the ifla attribute instead of the bridge option to retrieve its state. Sysfs export is fine, only netlink export has been affected. Fixes: 9163a0fc1f0c0 ("net: bridge: add support for per-port vlan stats") Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 9c07591b0232..7104cf13da84 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -1441,7 +1441,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) nla_put_u8(skb, IFLA_BR_VLAN_STATS_ENABLED, br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) || nla_put_u8(skb, IFLA_BR_VLAN_STATS_PER_PORT, - br_opt_get(br, IFLA_BR_VLAN_STATS_PER_PORT))) + br_opt_get(br, BROPT_VLAN_STATS_PER_PORT))) return -EMSGSIZE; #endif #ifdef CONFIG_BRIDGE_IGMP_SNOOPING