Commit 31ce6e01 authored by Stephen Hemminger's avatar Stephen Hemminger

update kernel headers from net-next

Take sanitized headers for davem net-next
parent 0c9ffc0b
...@@ -370,6 +370,8 @@ struct __sk_buff { ...@@ -370,6 +370,8 @@ struct __sk_buff {
__u32 cb[5]; __u32 cb[5];
__u32 hash; __u32 hash;
__u32 tc_classid; __u32 tc_classid;
__u32 data;
__u32 data_end;
}; };
struct bpf_tunnel_key { struct bpf_tunnel_key {
......
...@@ -10,6 +10,7 @@ enum { ...@@ -10,6 +10,7 @@ enum {
TCA_STATS_QUEUE, TCA_STATS_QUEUE,
TCA_STATS_APP, TCA_STATS_APP,
TCA_STATS_RATE_EST64, TCA_STATS_RATE_EST64,
TCA_STATS_PAD,
__TCA_STATS_MAX, __TCA_STATS_MAX,
}; };
#define TCA_STATS_MAX (__TCA_STATS_MAX - 1) #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
......
...@@ -134,6 +134,16 @@ struct bridge_vlan_info { ...@@ -134,6 +134,16 @@ struct bridge_vlan_info {
__u16 vid; __u16 vid;
}; };
struct bridge_vlan_xstats {
__u64 rx_bytes;
__u64 rx_packets;
__u64 tx_bytes;
__u64 tx_packets;
__u16 vid;
__u16 pad1;
__u32 pad2;
};
/* Bridge multicast database attributes /* Bridge multicast database attributes
* [MDBA_MDB] = { * [MDBA_MDB] = {
* [MDBA_MDB_ENTRY] = { * [MDBA_MDB_ENTRY] = {
...@@ -233,4 +243,12 @@ enum { ...@@ -233,4 +243,12 @@ enum {
}; };
#define MDBA_SET_ENTRY_MAX (__MDBA_SET_ENTRY_MAX - 1) #define MDBA_SET_ENTRY_MAX (__MDBA_SET_ENTRY_MAX - 1)
/* Embedded inside LINK_XSTATS_TYPE_BRIDGE */
enum {
BRIDGE_XSTATS_UNSPEC,
BRIDGE_XSTATS_VLAN,
__BRIDGE_XSTATS_MAX
};
#define BRIDGE_XSTATS_MAX (__BRIDGE_XSTATS_MAX - 1)
#endif /* _LINUX_IF_BRIDGE_H */ #endif /* _LINUX_IF_BRIDGE_H */
...@@ -269,6 +269,8 @@ enum { ...@@ -269,6 +269,8 @@ enum {
IFLA_BR_NF_CALL_IP6TABLES, IFLA_BR_NF_CALL_IP6TABLES,
IFLA_BR_NF_CALL_ARPTABLES, IFLA_BR_NF_CALL_ARPTABLES,
IFLA_BR_VLAN_DEFAULT_PVID, IFLA_BR_VLAN_DEFAULT_PVID,
IFLA_BR_PAD,
IFLA_BR_VLAN_STATS_ENABLED,
__IFLA_BR_MAX, __IFLA_BR_MAX,
}; };
...@@ -311,6 +313,7 @@ enum { ...@@ -311,6 +313,7 @@ enum {
IFLA_BRPORT_HOLD_TIMER, IFLA_BRPORT_HOLD_TIMER,
IFLA_BRPORT_FLUSH, IFLA_BRPORT_FLUSH,
IFLA_BRPORT_MULTICAST_ROUTER, IFLA_BRPORT_MULTICAST_ROUTER,
IFLA_BRPORT_PAD,
__IFLA_BRPORT_MAX __IFLA_BRPORT_MAX
}; };
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
...@@ -430,6 +433,7 @@ enum { ...@@ -430,6 +433,7 @@ enum {
IFLA_MACSEC_SCB, IFLA_MACSEC_SCB,
IFLA_MACSEC_REPLAY_PROTECT, IFLA_MACSEC_REPLAY_PROTECT,
IFLA_MACSEC_VALIDATION, IFLA_MACSEC_VALIDATION,
IFLA_MACSEC_PAD,
__IFLA_MACSEC_MAX, __IFLA_MACSEC_MAX,
}; };
...@@ -515,6 +519,24 @@ enum { ...@@ -515,6 +519,24 @@ enum {
}; };
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
/* PPP section */
enum {
IFLA_PPP_UNSPEC,
IFLA_PPP_DEV_FD,
__IFLA_PPP_MAX
};
#define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)
/* GTP section */
enum {
IFLA_GTP_UNSPEC,
IFLA_GTP_FD0,
IFLA_GTP_FD1,
IFLA_GTP_PDP_HASHSIZE,
__IFLA_GTP_MAX,
};
#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
/* Bonding section */ /* Bonding section */
enum { enum {
...@@ -664,6 +686,7 @@ enum { ...@@ -664,6 +686,7 @@ enum {
IFLA_VF_STATS_TX_BYTES, IFLA_VF_STATS_TX_BYTES,
IFLA_VF_STATS_BROADCAST, IFLA_VF_STATS_BROADCAST,
IFLA_VF_STATS_MULTICAST, IFLA_VF_STATS_MULTICAST,
IFLA_VF_STATS_PAD,
__IFLA_VF_STATS_MAX, __IFLA_VF_STATS_MAX,
}; };
...@@ -796,6 +819,7 @@ struct if_stats_msg { ...@@ -796,6 +819,7 @@ struct if_stats_msg {
enum { enum {
IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */ IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
IFLA_STATS_LINK_64, IFLA_STATS_LINK_64,
IFLA_STATS_LINK_XSTATS,
__IFLA_STATS_MAX, __IFLA_STATS_MAX,
}; };
...@@ -803,4 +827,16 @@ enum { ...@@ -803,4 +827,16 @@ enum {
#define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1)) #define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1))
/* These are embedded into IFLA_STATS_LINK_XSTATS:
* [IFLA_STATS_LINK_XSTATS]
* -> [LINK_XSTATS_TYPE_xxx]
* -> [rtnl link type specific attributes]
*/
enum {
LINK_XSTATS_TYPE_UNSPEC,
LINK_XSTATS_TYPE_BRIDGE,
__LINK_XSTATS_TYPE_MAX
};
#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
#endif /* _LINUX_IF_LINK_H */ #endif /* _LINUX_IF_LINK_H */
...@@ -14,6 +14,8 @@ enum { ...@@ -14,6 +14,8 @@ enum {
ILA_ATTR_LOCATOR_MATCH, /* u64 */ ILA_ATTR_LOCATOR_MATCH, /* u64 */
ILA_ATTR_IFINDEX, /* s32 */ ILA_ATTR_IFINDEX, /* s32 */
ILA_ATTR_DIR, /* u32 */ ILA_ATTR_DIR, /* u32 */
ILA_ATTR_PAD,
ILA_ATTR_CSUM_MODE, /* u8 */
__ILA_ATTR_MAX, __ILA_ATTR_MAX,
}; };
...@@ -34,4 +36,10 @@ enum { ...@@ -34,4 +36,10 @@ enum {
#define ILA_DIR_IN (1 << 0) #define ILA_DIR_IN (1 << 0)
#define ILA_DIR_OUT (1 << 1) #define ILA_DIR_OUT (1 << 1)
enum {
ILA_CSUM_ADJUST_TRANSPORT,
ILA_CSUM_NEUTRAL_MAP,
ILA_CSUM_NO_ACTION,
};
#endif /* _LINUX_ILA_H */ #endif /* _LINUX_ILA_H */
...@@ -115,9 +115,11 @@ enum { ...@@ -115,9 +115,11 @@ enum {
INET_DIAG_SKV6ONLY, INET_DIAG_SKV6ONLY,
INET_DIAG_LOCALS, INET_DIAG_LOCALS,
INET_DIAG_PEERS, INET_DIAG_PEERS,
INET_DIAG_PAD,
__INET_DIAG_MAX,
}; };
#define INET_DIAG_MAX INET_DIAG_SKV6ONLY #define INET_DIAG_MAX (__INET_DIAG_MAX - 1)
/* INET_DIAG_MEM */ /* INET_DIAG_MEM */
......
...@@ -141,6 +141,7 @@ enum { ...@@ -141,6 +141,7 @@ enum {
L2TP_ATTR_RX_SEQ_DISCARDS, /* u64 */ L2TP_ATTR_RX_SEQ_DISCARDS, /* u64 */
L2TP_ATTR_RX_OOS_PACKETS, /* u64 */ L2TP_ATTR_RX_OOS_PACKETS, /* u64 */
L2TP_ATTR_RX_ERRORS, /* u64 */ L2TP_ATTR_RX_ERRORS, /* u64 */
L2TP_ATTR_STATS_PAD,
__L2TP_ATTR_STATS_MAX, __L2TP_ATTR_STATS_MAX,
}; };
......
...@@ -12,6 +12,7 @@ enum { ...@@ -12,6 +12,7 @@ enum {
TCA_ACT_OPTIONS, TCA_ACT_OPTIONS,
TCA_ACT_INDEX, TCA_ACT_INDEX,
TCA_ACT_STATS, TCA_ACT_STATS,
TCA_ACT_PAD,
__TCA_ACT_MAX __TCA_ACT_MAX
}; };
...@@ -119,6 +120,7 @@ enum { ...@@ -119,6 +120,7 @@ enum {
TCA_U32_PCNT, TCA_U32_PCNT,
TCA_U32_MARK, TCA_U32_MARK,
TCA_U32_FLAGS, TCA_U32_FLAGS,
TCA_U32_PAD,
__TCA_U32_MAX __TCA_U32_MAX
}; };
......
...@@ -179,6 +179,7 @@ enum { ...@@ -179,6 +179,7 @@ enum {
TCA_TBF_PRATE64, TCA_TBF_PRATE64,
TCA_TBF_BURST, TCA_TBF_BURST,
TCA_TBF_PBURST, TCA_TBF_PBURST,
TCA_TBF_PAD,
__TCA_TBF_MAX, __TCA_TBF_MAX,
}; };
...@@ -368,6 +369,7 @@ enum { ...@@ -368,6 +369,7 @@ enum {
TCA_HTB_DIRECT_QLEN, TCA_HTB_DIRECT_QLEN,
TCA_HTB_RATE64, TCA_HTB_RATE64,
TCA_HTB_CEIL64, TCA_HTB_CEIL64,
TCA_HTB_PAD,
__TCA_HTB_MAX, __TCA_HTB_MAX,
}; };
...@@ -531,6 +533,7 @@ enum { ...@@ -531,6 +533,7 @@ enum {
TCA_NETEM_RATE, TCA_NETEM_RATE,
TCA_NETEM_ECN, TCA_NETEM_ECN,
TCA_NETEM_RATE64, TCA_NETEM_RATE64,
TCA_NETEM_PAD,
__TCA_NETEM_MAX, __TCA_NETEM_MAX,
}; };
...@@ -715,6 +718,8 @@ enum { ...@@ -715,6 +718,8 @@ enum {
TCA_FQ_CODEL_FLOWS, TCA_FQ_CODEL_FLOWS,
TCA_FQ_CODEL_QUANTUM, TCA_FQ_CODEL_QUANTUM,
TCA_FQ_CODEL_CE_THRESHOLD, TCA_FQ_CODEL_CE_THRESHOLD,
TCA_FQ_CODEL_DROP_BATCH_SIZE,
TCA_FQ_CODEL_MEMORY_LIMIT,
__TCA_FQ_CODEL_MAX __TCA_FQ_CODEL_MAX
}; };
...@@ -739,6 +744,8 @@ struct tc_fq_codel_qd_stats { ...@@ -739,6 +744,8 @@ struct tc_fq_codel_qd_stats {
__u32 new_flows_len; /* count of flows in new list */ __u32 new_flows_len; /* count of flows in new list */
__u32 old_flows_len; /* count of flows in old list */ __u32 old_flows_len; /* count of flows in old list */
__u32 ce_mark; /* packets above ce_threshold */ __u32 ce_mark; /* packets above ce_threshold */
__u32 memory_usage; /* in bytes */
__u32 drop_overmemory;
}; };
struct tc_fq_codel_cl_stats { struct tc_fq_codel_cl_stats {
......
...@@ -542,6 +542,7 @@ enum { ...@@ -542,6 +542,7 @@ enum {
TCA_FCNT, TCA_FCNT,
TCA_STATS2, TCA_STATS2,
TCA_STAB, TCA_STAB,
TCA_PAD,
__TCA_MAX __TCA_MAX
}; };
......
...@@ -26,6 +26,7 @@ enum { ...@@ -26,6 +26,7 @@ enum {
TCA_ACT_BPF_OPS, TCA_ACT_BPF_OPS,
TCA_ACT_BPF_FD, TCA_ACT_BPF_FD,
TCA_ACT_BPF_NAME, TCA_ACT_BPF_NAME,
TCA_ACT_BPF_PAD,
__TCA_ACT_BPF_MAX, __TCA_ACT_BPF_MAX,
}; };
#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1) #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
......
...@@ -15,6 +15,7 @@ enum { ...@@ -15,6 +15,7 @@ enum {
TCA_CONNMARK_UNSPEC, TCA_CONNMARK_UNSPEC,
TCA_CONNMARK_PARMS, TCA_CONNMARK_PARMS,
TCA_CONNMARK_TM, TCA_CONNMARK_TM,
TCA_CONNMARK_PAD,
__TCA_CONNMARK_MAX __TCA_CONNMARK_MAX
}; };
#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1) #define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
......
...@@ -10,6 +10,7 @@ enum { ...@@ -10,6 +10,7 @@ enum {
TCA_CSUM_UNSPEC, TCA_CSUM_UNSPEC,
TCA_CSUM_PARMS, TCA_CSUM_PARMS,
TCA_CSUM_TM, TCA_CSUM_TM,
TCA_CSUM_PAD,
__TCA_CSUM_MAX __TCA_CSUM_MAX
}; };
#define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1) #define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1)
......
...@@ -12,6 +12,7 @@ enum { ...@@ -12,6 +12,7 @@ enum {
TCA_DEF_TM, TCA_DEF_TM,
TCA_DEF_PARMS, TCA_DEF_PARMS,
TCA_DEF_DATA, TCA_DEF_DATA,
TCA_DEF_PAD,
__TCA_DEF_MAX __TCA_DEF_MAX
}; };
#define TCA_DEF_MAX (__TCA_DEF_MAX - 1) #define TCA_DEF_MAX (__TCA_DEF_MAX - 1)
......
...@@ -25,6 +25,7 @@ enum { ...@@ -25,6 +25,7 @@ enum {
TCA_GACT_TM, TCA_GACT_TM,
TCA_GACT_PARMS, TCA_GACT_PARMS,
TCA_GACT_PROB, TCA_GACT_PROB,
TCA_GACT_PAD,
__TCA_GACT_MAX __TCA_GACT_MAX
}; };
#define TCA_GACT_MAX (__TCA_GACT_MAX - 1) #define TCA_GACT_MAX (__TCA_GACT_MAX - 1)
......
...@@ -14,6 +14,7 @@ enum { ...@@ -14,6 +14,7 @@ enum {
TCA_IPT_CNT, TCA_IPT_CNT,
TCA_IPT_TM, TCA_IPT_TM,
TCA_IPT_TARG, TCA_IPT_TARG,
TCA_IPT_PAD,
__TCA_IPT_MAX __TCA_IPT_MAX
}; };
#define TCA_IPT_MAX (__TCA_IPT_MAX - 1) #define TCA_IPT_MAX (__TCA_IPT_MAX - 1)
......
...@@ -20,6 +20,7 @@ enum { ...@@ -20,6 +20,7 @@ enum {
TCA_MIRRED_UNSPEC, TCA_MIRRED_UNSPEC,
TCA_MIRRED_TM, TCA_MIRRED_TM,
TCA_MIRRED_PARMS, TCA_MIRRED_PARMS,
TCA_MIRRED_PAD,
__TCA_MIRRED_MAX __TCA_MIRRED_MAX
}; };
#define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1) #define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
......
...@@ -10,6 +10,7 @@ enum { ...@@ -10,6 +10,7 @@ enum {
TCA_NAT_UNSPEC, TCA_NAT_UNSPEC,
TCA_NAT_PARMS, TCA_NAT_PARMS,
TCA_NAT_TM, TCA_NAT_TM,
TCA_NAT_PAD,
__TCA_NAT_MAX __TCA_NAT_MAX
}; };
#define TCA_NAT_MAX (__TCA_NAT_MAX - 1) #define TCA_NAT_MAX (__TCA_NAT_MAX - 1)
......
...@@ -10,6 +10,7 @@ enum { ...@@ -10,6 +10,7 @@ enum {
TCA_PEDIT_UNSPEC, TCA_PEDIT_UNSPEC,
TCA_PEDIT_TM, TCA_PEDIT_TM,
TCA_PEDIT_PARMS, TCA_PEDIT_PARMS,
TCA_PEDIT_PAD,
__TCA_PEDIT_MAX __TCA_PEDIT_MAX
}; };
#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1) #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
......
...@@ -39,6 +39,7 @@ enum { ...@@ -39,6 +39,7 @@ enum {
TCA_SKBEDIT_PRIORITY, TCA_SKBEDIT_PRIORITY,
TCA_SKBEDIT_QUEUE_MAPPING, TCA_SKBEDIT_QUEUE_MAPPING,
TCA_SKBEDIT_MARK, TCA_SKBEDIT_MARK,
TCA_SKBEDIT_PAD,
__TCA_SKBEDIT_MAX __TCA_SKBEDIT_MAX
}; };
#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1) #define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
......
...@@ -28,6 +28,7 @@ enum { ...@@ -28,6 +28,7 @@ enum {
TCA_VLAN_PARMS, TCA_VLAN_PARMS,
TCA_VLAN_PUSH_VLAN_ID, TCA_VLAN_PUSH_VLAN_ID,
TCA_VLAN_PUSH_VLAN_PROTOCOL, TCA_VLAN_PUSH_VLAN_PROTOCOL,
TCA_VLAN_PAD,
__TCA_VLAN_MAX, __TCA_VLAN_MAX,
}; };
#define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1) #define TCA_VLAN_MAX (__TCA_VLAN_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