Commit b76b93dd authored by Stephen Hemminger's avatar Stephen Hemminger

update kernel headers from net-next

parent 6df9c7a0
...@@ -49,6 +49,7 @@ enum { ...@@ -49,6 +49,7 @@ enum {
FRA_TABLE, /* Extended table id */ FRA_TABLE, /* Extended table id */
FRA_FWMASK, /* mask for netfilter mark */ FRA_FWMASK, /* mask for netfilter mark */
FRA_OIFNAME, FRA_OIFNAME,
FRA_PAD,
__FRA_MAX __FRA_MAX
}; };
......
...@@ -124,6 +124,7 @@ enum { ...@@ -124,6 +124,7 @@ enum {
L2TP_ATTR_IP6_DADDR, /* struct in6_addr */ L2TP_ATTR_IP6_DADDR, /* struct in6_addr */
L2TP_ATTR_UDP_ZERO_CSUM6_TX, /* u8 */ L2TP_ATTR_UDP_ZERO_CSUM6_TX, /* u8 */
L2TP_ATTR_UDP_ZERO_CSUM6_RX, /* u8 */ L2TP_ATTR_UDP_ZERO_CSUM6_RX, /* u8 */
L2TP_ATTR_PAD,
__L2TP_ATTR_MAX, __L2TP_ATTR_MAX,
}; };
......
...@@ -22,6 +22,7 @@ enum lwtunnel_ip_t { ...@@ -22,6 +22,7 @@ enum lwtunnel_ip_t {
LWTUNNEL_IP_TTL, LWTUNNEL_IP_TTL,
LWTUNNEL_IP_TOS, LWTUNNEL_IP_TOS,
LWTUNNEL_IP_FLAGS, LWTUNNEL_IP_FLAGS,
LWTUNNEL_IP_PAD,
__LWTUNNEL_IP_MAX, __LWTUNNEL_IP_MAX,
}; };
...@@ -35,6 +36,7 @@ enum lwtunnel_ip6_t { ...@@ -35,6 +36,7 @@ enum lwtunnel_ip6_t {
LWTUNNEL_IP6_HOPLIMIT, LWTUNNEL_IP6_HOPLIMIT,
LWTUNNEL_IP6_TC, LWTUNNEL_IP6_TC,
LWTUNNEL_IP6_FLAGS, LWTUNNEL_IP6_FLAGS,
LWTUNNEL_IP6_PAD,
__LWTUNNEL_IP6_MAX, __LWTUNNEL_IP6_MAX,
}; };
......
...@@ -128,6 +128,7 @@ enum { ...@@ -128,6 +128,7 @@ enum {
NDTPA_LOCKTIME, /* u64, msecs */ NDTPA_LOCKTIME, /* u64, msecs */
NDTPA_QUEUE_LENBYTES, /* u32 */ NDTPA_QUEUE_LENBYTES, /* u32 */
NDTPA_MCAST_REPROBES, /* u32 */ NDTPA_MCAST_REPROBES, /* u32 */
NDTPA_PAD,
__NDTPA_MAX __NDTPA_MAX
}; };
#define NDTPA_MAX (__NDTPA_MAX - 1) #define NDTPA_MAX (__NDTPA_MAX - 1)
...@@ -160,6 +161,7 @@ enum { ...@@ -160,6 +161,7 @@ enum {
NDTA_PARMS, /* nested TLV NDTPA_* */ NDTA_PARMS, /* nested TLV NDTPA_* */
NDTA_STATS, /* struct ndt_stats, read-only */ NDTA_STATS, /* struct ndt_stats, read-only */
NDTA_GC_INTERVAL, /* u64, msecs */ NDTA_GC_INTERVAL, /* u64, msecs */
NDTA_PAD,
__NDTA_MAX __NDTA_MAX
}; };
#define NDTA_MAX (__NDTA_MAX - 1) #define NDTA_MAX (__NDTA_MAX - 1)
......
...@@ -40,6 +40,7 @@ enum { ...@@ -40,6 +40,7 @@ enum {
TCP_METRICS_ATTR_FOPEN_COOKIE, /* binary */ TCP_METRICS_ATTR_FOPEN_COOKIE, /* binary */
TCP_METRICS_ATTR_SADDR_IPV4, /* u32 */ TCP_METRICS_ATTR_SADDR_IPV4, /* u32 */
TCP_METRICS_ATTR_SADDR_IPV6, /* binary */ TCP_METRICS_ATTR_SADDR_IPV6, /* binary */
TCP_METRICS_ATTR_PAD,
__TCP_METRICS_ATTR_MAX, __TCP_METRICS_ATTR_MAX,
}; };
......
...@@ -302,6 +302,7 @@ enum xfrm_attr_type_t { ...@@ -302,6 +302,7 @@ enum xfrm_attr_type_t {
XFRMA_SA_EXTRA_FLAGS, /* __u32 */ XFRMA_SA_EXTRA_FLAGS, /* __u32 */
XFRMA_PROTO, /* __u8 */ XFRMA_PROTO, /* __u8 */
XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */ XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */
XFRMA_PAD,
__XFRMA_MAX __XFRMA_MAX
#define XFRMA_MAX (__XFRMA_MAX - 1) #define XFRMA_MAX (__XFRMA_MAX - 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment