From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Westphal Subject: [PATCH net-next 4/7] rtnetlink: add helper to dump ifalias Date: Thu, 21 Sep 2017 18:58:59 +0200 Message-ID: <20170921165902.10746-5-fw@strlen.de> References: <20170921165902.10746-1-fw@strlen.de> Cc: Florian Westphal To: Return-path: Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:39118 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751738AbdIUQ66 (ORCPT ); Thu, 21 Sep 2017 12:58:58 -0400 In-Reply-To: <20170921165902.10746-1-fw@strlen.de> Sender: netdev-owner@vger.kernel.org List-ID: ifalias is currently protected by rtnl mutex, add assertion as a reminder. Signed-off-by: Florian Westphal --- net/core/rtnetlink.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index ad3f27da37a8..1af3ef7f329d 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1345,6 +1345,16 @@ static int nla_put_qdisc(struct sk_buff *skb, struct net_device *dev) return ret; } +static int noinline nla_put_ifalias(struct sk_buff *skb, struct net_device *dev) +{ + ASSERT_RTNL(); + + if (dev->ifalias) + return nla_put_string(skb, IFLA_IFALIAS, dev->ifalias); + + return 0; +} + static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, int type, u32 pid, u32 seq, u32 change, unsigned int flags, u32 ext_filter_mask, @@ -1386,8 +1396,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, put_master_ifindex(skb, dev) || nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) || nla_put_qdisc(skb, dev) || - (dev->ifalias && - nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) || + nla_put_ifalias(skb, dev) || nla_put_u32(skb, IFLA_CARRIER_CHANGES, atomic_read(&dev->carrier_changes)) || nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down)) -- 2.13.5