Commit 0d7982ce authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

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: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a56493f

net/ipv6/addrconf.c

+3 −4
Original line number Diff line number Diff line
@@ -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:

CRA Git | Maintained and supported by SUSTech CRA and CCSE