diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2019-09-30 14:02:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-01 23:59:03 +0200 |
| commit | 0d7982ce6e3a683f55def32262c9fee2b87ec8e6 (patch) | |
| tree | 7550254cd564266a1ffc4d3a9ceb91728eb68998 /net/ipv6/addrconf.c | |
| parent | Merge branch 'netdev-altnames' (diff) | |
| download | linux-0d7982ce6e3a683f55def32262c9fee2b87ec8e6.tar.xz linux-0d7982ce6e3a683f55def32262c9fee2b87ec8e6.zip | |
ipv6: minor code reorg in inet6_fill_ifla6_attrs()
Just put related code together to ease code reading: the memcpy() is
related to the nla_reserve().
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv6/addrconf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 6a576ff92c39..413b00cf9c2b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5552,14 +5552,13 @@ static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev, nla = nla_reserve(skb, IFLA_INET6_TOKEN, sizeof(struct in6_addr)); if (!nla) goto nla_put_failure; - - if (nla_put_u8(skb, IFLA_INET6_ADDR_GEN_MODE, idev->cnf.addr_gen_mode)) - goto nla_put_failure; - read_lock_bh(&idev->lock); memcpy(nla_data(nla), idev->token.s6_addr, nla_len(nla)); read_unlock_bh(&idev->lock); + if (nla_put_u8(skb, IFLA_INET6_ADDR_GEN_MODE, idev->cnf.addr_gen_mode)) + goto nla_put_failure; + return 0; nla_put_failure: |