From: Florian Westphal <fw@strlen•de>
To: <netdev@vger•kernel.org>
Cc: Florian Westphal <fw@strlen•de>
Subject: [PATCH net-next v3 3/6] rtnetlink: add helper to dump ifalias
Date: Sat, 23 Sep 2017 21:26:33 +0200 [thread overview]
Message-ID: <20170923192636.3932-4-fw@strlen.de> (raw)
In-Reply-To: <20170923192636.3932-1-fw@strlen.de>
Reviewed-by: David Ahern <dsahern@gmail•com>
Signed-off-by: Florian Westphal <fw@strlen•de>
---
Changes since v3: don't add rtnl assertion, I placed the assertion
in my working tree instead as a reminder.
net/core/rtnetlink.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index c801212ee40e..47c17c3de79a 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1332,6 +1332,14 @@ static int nla_put_iflink(struct sk_buff *skb, const struct net_device *dev)
return nla_put_u32(skb, IFLA_LINK, ifindex);
}
+static noinline int nla_put_ifalias(struct sk_buff *skb, struct net_device *dev)
+{
+ 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,
@@ -1374,8 +1382,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) ||
(dev->qdisc &&
nla_put_string(skb, IFLA_QDISC, dev->qdisc->ops->id)) ||
- (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
next prev parent reply other threads:[~2017-09-23 19:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-23 19:26 [PATCH net-next v3 0/6] rtnetlink: preparation patches for further rtnl lock pushdown/removal Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 1/6] selftests: rtnetlink.sh: add rudimentary vrf test Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 2/6] rtnetlink: add helper to put master and link ifindexes Florian Westphal
2017-09-23 19:26 ` Florian Westphal [this message]
2017-09-23 21:04 ` [PATCH net-next v3 3/6] rtnetlink: add helper to dump ifalias Eric Dumazet
2017-09-23 21:21 ` Florian Westphal
2017-09-26 3:34 ` David Miller
2017-09-23 19:26 ` [PATCH net-next v3 4/6] rtnetlink: add helpers to dump vf information Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 5/6] rtnetlink: add helpers to dump netnsid information Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 6/6] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170923192636.3932-4-fw@strlen.de \
--to=fw@strlen$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox