From patchwork Thu Aug 13 19:26:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gospodarek X-Patchwork-Id: 507162 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 64ACA140326 for ; Fri, 14 Aug 2015 05:28:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=ahFc/Qvt; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753471AbbHMT20 (ORCPT ); Thu, 13 Aug 2015 15:28:26 -0400 Received: from mail-yk0-f180.google.com ([209.85.160.180]:33667 "EHLO mail-yk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751862AbbHMT2Z (ORCPT ); Thu, 13 Aug 2015 15:28:25 -0400 Received: by ykaz130 with SMTP id z130so50389592yka.0 for ; Thu, 13 Aug 2015 12:28:24 -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; bh=X7dM8LoK/LJmc4Tov/W2Yb+42AA/lkekBkLV8Vp3IPI=; b=ahFc/Qvt18upjsJB5JcOY2kHIg6Q48LPWNjuSiQtPHb+Uph8ZKXj1xkzdlb5shTImW AuHx3PbOv/OCq7fM8IiKLuAbtzOMYm+55rXjSVWJAp4JWgoArjdam2EryCeyQFQVUJgs g0uvBshRe+fhZfwY3mSBad6lO2xzqUz6XhRgA= 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; bh=X7dM8LoK/LJmc4Tov/W2Yb+42AA/lkekBkLV8Vp3IPI=; b=OCN3vV3TK2t0v8yKSILT1YZk5El9OW0ci6EDvlM1tfInEabX1bLoTfWkhlxBwN2QgZ xAeQdI8Jt/s9972qRCxe+naLr7BTSXTfXf2LPBTJAmI9h+a+oVvlnjlT3AS3HS0cENV/ I65M8j6DEuaDAyVNFXXpWel77geRoYZ75ClRCSF7rGcds/+tVEtq+88s7tTn+TVmy4o4 GwGEpFXoNB10+vpxraZRls1Lk3TjgBJN/PvN8wdvR5fDF46tIPu7Arqao8NBTHkFnMRW okl7lNG6V1VCFU6HPTedAqNF9R2xL/4Sj5tUvmN1qVKAwxaQn2Y5bhtdncGVSzFH88y9 s4TQ== X-Gm-Message-State: ALoCoQkoGEER8Sya7xaJAK1/GGgnGvIyYH8nG7eRAPCpp1TsNRHsAjT5qxAbcbR9zK3Dru+90NOq X-Received: by 10.129.46.134 with SMTP id u128mr26360821ywu.92.1439494104355; Thu, 13 Aug 2015 12:28:24 -0700 (PDT) Received: from fedora-devel.home.greyhouse.net (cpe-65-190-8-248.nc.res.rr.com. [65.190.8.248]) by smtp.googlemail.com with ESMTPSA id d70sm2892259ywe.52.2015.08.13.12.28.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Aug 2015 12:28:23 -0700 (PDT) From: Andy Gospodarek To: netdev@vger.kernel.org Cc: Andy Gospodarek Subject: [PATCH net-next] net: addr IFLA_OPERSTATE to netlink message for ipv6 ifinfo Date: Thu, 13 Aug 2015 15:26:35 -0400 Message-Id: <1439493995-1079-1-git-send-email-gospo@cumulusnetworks.com> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is useful information to include in ipv6 netlink messages that report interface information. IFLA_OPERSTATE is already included in ipv4 messages, but missing for ipv6. This closes that gap. Signed-off-by: Andy Gospodarek --- net/ipv6/addrconf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 53e3a9d..d119686 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4637,6 +4637,7 @@ static inline size_t inet6_if_nlmsg_size(void) + nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */ + nla_total_size(4) /* IFLA_MTU */ + nla_total_size(4) /* IFLA_LINK */ + + nla_total_size(1) /* IFLA_OPERSTATE */ + nla_total_size(inet6_ifla6_size()); /* IFLA_PROTINFO */ } @@ -4893,7 +4894,9 @@ static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev, nla_put(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr)) || nla_put_u32(skb, IFLA_MTU, dev->mtu) || (dev->ifindex != dev_get_iflink(dev) && - nla_put_u32(skb, IFLA_LINK, dev_get_iflink(dev)))) + nla_put_u32(skb, IFLA_LINK, dev_get_iflink(dev))) || + nla_put_u8(skb, IFLA_OPERSTATE, + netif_running(dev) ? dev->operstate : IF_OPER_DOWN)) goto nla_put_failure; protoinfo = nla_nest_start(skb, IFLA_PROTINFO); if (!protoinfo)