{"id":817819,"url":"http://patchwork.ozlabs.org/api/patches/817819/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170923192636.3932-4-fw@strlen.de/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170923192636.3932-4-fw@strlen.de>","list_archive_url":null,"date":"2017-09-23T19:26:33","name":"[net-next,v3,3/6] rtnetlink: add helper to dump ifalias","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"9551a57441d4a9d2e37101b7a45b4997c3c45f19","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170923192636.3932-4-fw@strlen.de/mbox/","series":[{"id":4777,"url":"http://patchwork.ozlabs.org/api/series/4777/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4777","date":"2017-09-23T19:26:30","name":"rtnetlink: preparation patches for further rtnl lock pushdown/removal","version":3,"mbox":"http://patchwork.ozlabs.org/series/4777/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817819/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817819/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y00hV0styz9t49\n\tfor ;\n\tSun, 24 Sep 2017 05:26:34 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751821AbdIWT0b (ORCPT );\n\tSat, 23 Sep 2017 15:26:31 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:46818 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751740AbdIWT03 (ORCPT\n\t); Sat, 23 Sep 2017 15:26:29 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dvq13-0002sn-7V; Sat, 23 Sep 2017 21:23:05 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next v3 3/6] rtnetlink: add helper to dump ifalias","Date":"Sat, 23 Sep 2017 21:26:33 +0200","Message-Id":"<20170923192636.3932-4-fw@strlen.de>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170923192636.3932-1-fw@strlen.de>","References":"<20170923192636.3932-1-fw@strlen.de>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Reviewed-by: David Ahern \nSigned-off-by: Florian Westphal \n---\n Changes since v3: don't add rtnl assertion, I placed the assertion\n in my working tree instead as a reminder.\n\n net/core/rtnetlink.c | 11 +++++++++--\n 1 file changed, 9 insertions(+), 2 deletions(-)","diff":"diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c\nindex c801212ee40e..47c17c3de79a 100644\n--- a/net/core/rtnetlink.c\n+++ b/net/core/rtnetlink.c\n@@ -1332,6 +1332,14 @@ static int nla_put_iflink(struct sk_buff *skb, const struct net_device *dev)\n \treturn nla_put_u32(skb, IFLA_LINK, ifindex);\n }\n \n+static noinline int nla_put_ifalias(struct sk_buff *skb, struct net_device *dev)\n+{\n+\tif (dev->ifalias)\n+\t\treturn nla_put_string(skb, IFLA_IFALIAS, dev->ifalias);\n+\n+\treturn 0;\n+}\n+\n static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n \t\t\t int type, u32 pid, u32 seq, u32 change,\n \t\t\t unsigned int flags, u32 ext_filter_mask,\n@@ -1374,8 +1382,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,\n \t nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) ||\n \t (dev->qdisc &&\n \t nla_put_string(skb, IFLA_QDISC, dev->qdisc->ops->id)) ||\n-\t (dev->ifalias &&\n-\t nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||\n+\t nla_put_ifalias(skb, dev) ||\n \t nla_put_u32(skb, IFLA_CARRIER_CHANGES,\n \t\t\tatomic_read(&dev->carrier_changes)) ||\n \t nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down))\n","prefixes":["net-next","v3","3/6"]}