commit 58414d32a37e4c2f79da91aebc2d2365918a1562
author Nicolas Dichtel <nicolas.dichtel@6wind.com> Thu Apr 21 18:58:25 2016 +0200
committer David S. Miller <davem@davemloft.net> Thu Apr 21 14:22:13 2016 -0400
tree 6ec1febdc87b7aed86e4f5c01e92cfe77c580f2c
parent 089bf1a6a924b97a7e9f920bae6253a8ad581cf3

rtnl: use the new API to align IFLA_STATS*

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/core/rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 4a47a9a..5ec059d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1051,14 +1051,9 @@
 {
 	struct rtnl_link_stats64 *sp;
 	struct nlattr *attr;
-	int err;
 
-	err = nla_align_64bit(skb, IFLA_PAD);
-	if (err)
-		return err;
-
-	attr = nla_reserve(skb, IFLA_STATS64,
-			   sizeof(struct rtnl_link_stats64));
+	attr = nla_reserve_64bit(skb, IFLA_STATS64,
+				 sizeof(struct rtnl_link_stats64), IFLA_PAD);
 	if (!attr)
 		return -EMSGSIZE;
 
@@ -3469,17 +3464,10 @@
 
 	if (filter_mask & IFLA_STATS_FILTER_BIT(IFLA_STATS_LINK_64)) {
 		struct rtnl_link_stats64 *sp;
-		int err;
 
-		/* if necessary, add a zero length NOP attribute so that
-		 * IFLA_STATS_LINK_64 will be 64-bit aligned
-		 */
-		err = nla_align_64bit(skb, IFLA_STATS_UNSPEC);
-		if (err)
-			goto nla_put_failure;
-
-		attr = nla_reserve(skb, IFLA_STATS_LINK_64,
-				   sizeof(struct rtnl_link_stats64));
+		attr = nla_reserve_64bit(skb, IFLA_STATS_LINK_64,
+					 sizeof(struct rtnl_link_stats64),
+					 IFLA_STATS_UNSPEC);
 		if (!attr)
 			goto nla_put_failure;