libnl: nla_put_be64(): align on a 64-bit area

nla_data() is now aligned on a 64-bit area.

A temporary version (nla_put_be64_32bit()) is added for nla_put_net64().
This function is removed in the next patch.

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

6 files changed, 16 insertions, 0 deletions

diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index 96161b8202b5..620c8a5ddc00 100644
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
@@ -49,6 +49,7 @@ enum {
         FRA_TABLE,      /* Extended table id */
         FRA_FWMASK,     /* mask for netfilter mark */
         FRA_OIFNAME,
+        FRA_PAD,
         __FRA_MAX
 };
 
diff --git a/include/uapi/linux/lwtunnel.h b/include/uapi/linux/lwtunnel.h
index f8b01887a495..a478fe80e203 100644
--- a/include/uapi/linux/lwtunnel.h
+++ b/include/uapi/linux/lwtunnel.h
@@ -22,6 +22,7 @@ enum lwtunnel_ip_t {
         LWTUNNEL_IP_TTL,
         LWTUNNEL_IP_TOS,
         LWTUNNEL_IP_FLAGS,
+        LWTUNNEL_IP_PAD,
         __LWTUNNEL_IP_MAX,
 };
 
@@ -35,6 +36,7 @@ enum lwtunnel_ip6_t {
         LWTUNNEL_IP6_HOPLIMIT,
         LWTUNNEL_IP6_TC,
         LWTUNNEL_IP6_FLAGS,
+        LWTUNNEL_IP6_PAD,
         __LWTUNNEL_IP6_MAX,
 };
 
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index eeffde196f80..660231363bb5 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -182,6 +182,7 @@ enum nft_chain_attributes {
         NFTA_CHAIN_USE,
         NFTA_CHAIN_TYPE,
         NFTA_CHAIN_COUNTERS,
+        NFTA_CHAIN_PAD,
         __NFTA_CHAIN_MAX
 };
 #define NFTA_CHAIN_MAX          (__NFTA_CHAIN_MAX - 1)
@@ -206,6 +207,7 @@ enum nft_rule_attributes {
         NFTA_RULE_COMPAT,
         NFTA_RULE_POSITION,
         NFTA_RULE_USERDATA,
+        NFTA_RULE_PAD,
         __NFTA_RULE_MAX
 };
 #define NFTA_RULE_MAX           (__NFTA_RULE_MAX - 1)
@@ -308,6 +310,7 @@ enum nft_set_attributes {
         NFTA_SET_TIMEOUT,
         NFTA_SET_GC_INTERVAL,
         NFTA_SET_USERDATA,
+        NFTA_SET_PAD,
         __NFTA_SET_MAX
 };
 #define NFTA_SET_MAX            (__NFTA_SET_MAX - 1)
@@ -341,6 +344,7 @@ enum nft_set_elem_attributes {
         NFTA_SET_ELEM_EXPIRATION,
         NFTA_SET_ELEM_USERDATA,
         NFTA_SET_ELEM_EXPR,
+        NFTA_SET_ELEM_PAD,
         __NFTA_SET_ELEM_MAX
 };
 #define NFTA_SET_ELEM_MAX       (__NFTA_SET_ELEM_MAX - 1)
@@ -584,6 +588,7 @@ enum nft_dynset_attributes {
         NFTA_DYNSET_SREG_DATA,
         NFTA_DYNSET_TIMEOUT,
         NFTA_DYNSET_EXPR,
+        NFTA_DYNSET_PAD,
         __NFTA_DYNSET_MAX,
 };
 #define NFTA_DYNSET_MAX         (__NFTA_DYNSET_MAX - 1)
@@ -806,6 +811,7 @@ enum nft_limit_attributes {
         NFTA_LIMIT_BURST,
         NFTA_LIMIT_TYPE,
         NFTA_LIMIT_FLAGS,
+        NFTA_LIMIT_PAD,
         __NFTA_LIMIT_MAX
 };
 #define NFTA_LIMIT_MAX          (__NFTA_LIMIT_MAX - 1)
@@ -820,6 +826,7 @@ enum nft_counter_attributes {
         NFTA_COUNTER_UNSPEC,
         NFTA_COUNTER_BYTES,
         NFTA_COUNTER_PACKETS,
+        NFTA_COUNTER_PAD,
         __NFTA_COUNTER_MAX
 };
 #define NFTA_COUNTER_MAX        (__NFTA_COUNTER_MAX - 1)
@@ -1055,6 +1062,7 @@ enum nft_trace_attibutes {
         NFTA_TRACE_MARK,
         NFTA_TRACE_NFPROTO,
         NFTA_TRACE_POLICY,
+        NFTA_TRACE_PAD,
         __NFTA_TRACE_MAX
 };
 #define NFTA_TRACE_MAX (__NFTA_TRACE_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nfnetlink_acct.h b/include/uapi/linux/netfilter/nfnetlink_acct.h
index f3e34dbbf966..36047ec70f37 100644
--- a/include/uapi/linux/netfilter/nfnetlink_acct.h
+++ b/include/uapi/linux/netfilter/nfnetlink_acct.h
@@ -29,6 +29,7 @@ enum nfnl_acct_type {
         NFACCT_FLAGS,
         NFACCT_QUOTA,
         NFACCT_FILTER,
+        NFACCT_PAD,
         __NFACCT_MAX
 };
 #define NFACCT_MAX (__NFACCT_MAX - 1)
diff --git a/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index c1a4e1441a25..9df789709abe 100644
--- a/include/uapi/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
@@ -116,6 +116,7 @@ enum ctattr_protoinfo_dccp {
         CTA_PROTOINFO_DCCP_STATE,
         CTA_PROTOINFO_DCCP_ROLE,
         CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
+        CTA_PROTOINFO_DCCP_PAD,
         __CTA_PROTOINFO_DCCP_MAX,
 };
 #define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
@@ -135,6 +136,7 @@ enum ctattr_counters {
         CTA_COUNTERS_BYTES,             /* 64bit counters */
         CTA_COUNTERS32_PACKETS,         /* old 32bit counters, unused */
         CTA_COUNTERS32_BYTES,           /* old 32bit counters, unused */
+        CTA_COUNTERS_PAD,
         __CTA_COUNTERS_MAX
 };
 #define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
@@ -143,6 +145,7 @@ enum ctattr_tstamp {
         CTA_TIMESTAMP_UNSPEC,
         CTA_TIMESTAMP_START,
         CTA_TIMESTAMP_STOP,
+        CTA_TIMESTAMP_PAD,
         __CTA_TIMESTAMP_MAX
 };
 #define CTA_TIMESTAMP_MAX (__CTA_TIMESTAMP_MAX - 1)
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index 616d04761730..0358f94af86e 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -351,6 +351,7 @@ enum ovs_tunnel_key_attr {
         OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS,         /* Nested OVS_VXLAN_EXT_* */
         OVS_TUNNEL_KEY_ATTR_IPV6_SRC,           /* struct in6_addr src IPv6 address. */
         OVS_TUNNEL_KEY_ATTR_IPV6_DST,           /* struct in6_addr dst IPv6 address. */
+        OVS_TUNNEL_KEY_ATTR_PAD,
         __OVS_TUNNEL_KEY_ATTR_MAX
 };