aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2016-04-22 11:31:21 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-23 20:13:24 -0400
commit2175d87cc3561c02e605bc8ac81ee5d875a51b9e (patch)
tree4716918fa0dc60b699cadb80ba2e143a1cd9081c /include/uapi
parent756a2f59b73cd6ed8afae3f6e8efb3fb829e4600 (diff)
libnl: nla_put_msecs(): align on a 64-bit area
nla_data() is now aligned on a 64-bit area. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/l2tp.h1
-rw-r--r--include/uapi/linux/neighbour.h2
-rw-r--r--include/uapi/linux/tcp_metrics.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h
index 347ef22a964e..3386a99e0397 100644
--- a/include/uapi/linux/l2tp.h
+++ b/include/uapi/linux/l2tp.h
@@ -126,6 +126,7 @@ enum {
126 L2TP_ATTR_IP6_DADDR, /* struct in6_addr */ 126 L2TP_ATTR_IP6_DADDR, /* struct in6_addr */
127 L2TP_ATTR_UDP_ZERO_CSUM6_TX, /* u8 */ 127 L2TP_ATTR_UDP_ZERO_CSUM6_TX, /* u8 */
128 L2TP_ATTR_UDP_ZERO_CSUM6_RX, /* u8 */ 128 L2TP_ATTR_UDP_ZERO_CSUM6_RX, /* u8 */
129 L2TP_ATTR_PAD,
129 __L2TP_ATTR_MAX, 130 __L2TP_ATTR_MAX,
130}; 131};
131 132
diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 788655bfa0f3..bd99a8d80f36 100644
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -128,6 +128,7 @@ enum {
128 NDTPA_LOCKTIME, /* u64, msecs */ 128 NDTPA_LOCKTIME, /* u64, msecs */
129 NDTPA_QUEUE_LENBYTES, /* u32 */ 129 NDTPA_QUEUE_LENBYTES, /* u32 */
130 NDTPA_MCAST_REPROBES, /* u32 */ 130 NDTPA_MCAST_REPROBES, /* u32 */
131 NDTPA_PAD,
131 __NDTPA_MAX 132 __NDTPA_MAX
132}; 133};
133#define NDTPA_MAX (__NDTPA_MAX - 1) 134#define NDTPA_MAX (__NDTPA_MAX - 1)
@@ -160,6 +161,7 @@ enum {
160 NDTA_PARMS, /* nested TLV NDTPA_* */ 161 NDTA_PARMS, /* nested TLV NDTPA_* */
161 NDTA_STATS, /* struct ndt_stats, read-only */ 162 NDTA_STATS, /* struct ndt_stats, read-only */
162 NDTA_GC_INTERVAL, /* u64, msecs */ 163 NDTA_GC_INTERVAL, /* u64, msecs */
164 NDTA_PAD,
163 __NDTA_MAX 165 __NDTA_MAX
164}; 166};
165#define NDTA_MAX (__NDTA_MAX - 1) 167#define NDTA_MAX (__NDTA_MAX - 1)
diff --git a/include/uapi/linux/tcp_metrics.h b/include/uapi/linux/tcp_metrics.h
index 93533926035c..80ad90d0cfc2 100644
--- a/include/uapi/linux/tcp_metrics.h
+++ b/include/uapi/linux/tcp_metrics.h
@@ -40,6 +40,7 @@ enum {
40 TCP_METRICS_ATTR_FOPEN_COOKIE, /* binary */ 40 TCP_METRICS_ATTR_FOPEN_COOKIE, /* binary */
41 TCP_METRICS_ATTR_SADDR_IPV4, /* u32 */ 41 TCP_METRICS_ATTR_SADDR_IPV4, /* u32 */
42 TCP_METRICS_ATTR_SADDR_IPV6, /* binary */ 42 TCP_METRICS_ATTR_SADDR_IPV6, /* binary */
43 TCP_METRICS_ATTR_PAD,
43 44
44 __TCP_METRICS_ATTR_MAX, 45 __TCP_METRICS_ATTR_MAX,
45}; 46};