net: Add helpers for 64-bit aligning netlink attributes.
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Suggested-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 198ca2c..d3694a1 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -878,10 +878,7 @@
+ nla_total_size(IFNAMSIZ) /* IFLA_QDISC */
+ nla_total_size(sizeof(struct rtnl_link_ifmap))
+ nla_total_size(sizeof(struct rtnl_link_stats))
-#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
- + nla_total_size(0) /* IFLA_PAD */
-#endif
- + nla_total_size(sizeof(struct rtnl_link_stats64))
+ + nla_total_size_64bit(sizeof(struct rtnl_link_stats64))
+ nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */
+ nla_total_size(MAX_ADDR_LEN) /* IFLA_BROADCAST */
+ nla_total_size(4) /* IFLA_TXQLEN */
@@ -1054,22 +1051,11 @@
{
struct rtnl_link_stats64 *sp;
struct nlattr *attr;
+ int err;
-#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
- /* IF necessary, add a zero length NOP attribute so that the
- * nla_data() of the IFLA_STATS64 will be 64-bit aligned.
- *
- * The nlattr header is 4 bytes in size, that's why we test
- * if the skb->data _is_ aligned. This NOP attribute, plus
- * nlattr header for IFLA_STATS64, will make nla_data() 8-byte
- * aligned.
- */
- if (IS_ALIGNED((unsigned long)skb->data, 8)) {
- attr = nla_reserve(skb, IFLA_PAD, 0);
- if (!attr)
- return -EMSGSIZE;
- }
-#endif
+ err = nla_align_64bit(skb, IFLA_PAD);
+ if (err)
+ return err;
attr = nla_reserve(skb, IFLA_STATS64,
sizeof(struct rtnl_link_stats64));