Update kernel headers

Update kernel headers to commit:
    fe23d63422c8 Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2020-01-02 17:26:50 +00:00
parent 0dcf36db1a
commit a6cf98c23f
5 changed files with 39 additions and 9 deletions

View File

@ -231,6 +231,11 @@ enum bpf_attach_type {
* When children program makes decision (like picking TCP CA or sock bind) * When children program makes decision (like picking TCP CA or sock bind)
* parent program has a chance to override it. * parent program has a chance to override it.
* *
* With BPF_F_ALLOW_MULTI a new program is added to the end of the list of
* programs for a cgroup. Though it's possible to replace an old program at
* any position by also specifying BPF_F_REPLACE flag and position itself in
* replace_bpf_fd attribute. Old program at this position will be released.
*
* A cgroup with MULTI or OVERRIDE flag allows any attach flags in sub-cgroups. * A cgroup with MULTI or OVERRIDE flag allows any attach flags in sub-cgroups.
* A cgroup with NONE doesn't allow any programs in sub-cgroups. * A cgroup with NONE doesn't allow any programs in sub-cgroups.
* Ex1: * Ex1:
@ -249,6 +254,7 @@ enum bpf_attach_type {
*/ */
#define BPF_F_ALLOW_OVERRIDE (1U << 0) #define BPF_F_ALLOW_OVERRIDE (1U << 0)
#define BPF_F_ALLOW_MULTI (1U << 1) #define BPF_F_ALLOW_MULTI (1U << 1)
#define BPF_F_REPLACE (1U << 2)
/* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the /* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
* verifier will perform strict alignment checking as if the kernel * verifier will perform strict alignment checking as if the kernel
@ -442,6 +448,10 @@ union bpf_attr {
__u32 attach_bpf_fd; /* eBPF program to attach */ __u32 attach_bpf_fd; /* eBPF program to attach */
__u32 attach_type; __u32 attach_type;
__u32 attach_flags; __u32 attach_flags;
__u32 replace_bpf_fd; /* previously attached eBPF
* program to replace if
* BPF_F_REPLACE is used
*/
}; };
struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */ struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */

View File

@ -142,7 +142,8 @@ struct btf_param {
enum { enum {
BTF_VAR_STATIC = 0, BTF_VAR_STATIC = 0,
BTF_VAR_GLOBAL_ALLOCATED, BTF_VAR_GLOBAL_ALLOCATED = 1,
BTF_VAR_GLOBAL_EXTERN = 2,
}; };
/* BTF_KIND_VAR is followed by a single "struct btf_var" to describe /* BTF_KIND_VAR is followed by a single "struct btf_var" to describe

View File

@ -96,14 +96,14 @@
#define BOND_XMIT_POLICY_ENCAP34 4 /* encapsulated layer 3+4 */ #define BOND_XMIT_POLICY_ENCAP34 4 /* encapsulated layer 3+4 */
/* 802.3ad port state definitions (43.4.2.2 in the 802.3ad standard) */ /* 802.3ad port state definitions (43.4.2.2 in the 802.3ad standard) */
#define AD_STATE_LACP_ACTIVITY 0x1 #define LACP_STATE_LACP_ACTIVITY 0x1
#define AD_STATE_LACP_TIMEOUT 0x2 #define LACP_STATE_LACP_TIMEOUT 0x2
#define AD_STATE_AGGREGATION 0x4 #define LACP_STATE_AGGREGATION 0x4
#define AD_STATE_SYNCHRONIZATION 0x8 #define LACP_STATE_SYNCHRONIZATION 0x8
#define AD_STATE_COLLECTING 0x10 #define LACP_STATE_COLLECTING 0x10
#define AD_STATE_DISTRIBUTING 0x20 #define LACP_STATE_DISTRIBUTING 0x20
#define AD_STATE_DEFAULTED 0x40 #define LACP_STATE_DEFAULTED 0x40
#define AD_STATE_EXPIRED 0x80 #define LACP_STATE_EXPIRED 0x80
typedef struct ifbond { typedef struct ifbond {
__s32 bond_mode; __s32 bond_mode;

View File

@ -1187,4 +1187,21 @@ enum {
#define TCA_TAPRIO_ATTR_MAX (__TCA_TAPRIO_ATTR_MAX - 1) #define TCA_TAPRIO_ATTR_MAX (__TCA_TAPRIO_ATTR_MAX - 1)
/* ETS */
#define TCQ_ETS_MAX_BANDS 16
enum {
TCA_ETS_UNSPEC,
TCA_ETS_NBANDS, /* u8 */
TCA_ETS_NSTRICT, /* u8 */
TCA_ETS_QUANTA, /* nested TCA_ETS_QUANTA_BAND */
TCA_ETS_QUANTA_BAND, /* u32 */
TCA_ETS_PRIOMAP, /* nested TCA_ETS_PRIOMAP_BAND */
TCA_ETS_PRIOMAP_BAND, /* u8 */
__TCA_ETS_MAX,
};
#define TCA_ETS_MAX (__TCA_ETS_MAX - 1)
#endif #endif

View File

@ -65,6 +65,7 @@ enum {
TIPC_NL_UDP_GET_REMOTEIP, TIPC_NL_UDP_GET_REMOTEIP,
TIPC_NL_KEY_SET, TIPC_NL_KEY_SET,
TIPC_NL_KEY_FLUSH, TIPC_NL_KEY_FLUSH,
TIPC_NL_ADDR_LEGACY_GET,
__TIPC_NL_CMD_MAX, __TIPC_NL_CMD_MAX,
TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1 TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
@ -176,6 +177,7 @@ enum {
TIPC_NLA_NET_ADDR, /* u32 */ TIPC_NLA_NET_ADDR, /* u32 */
TIPC_NLA_NET_NODEID, /* u64 */ TIPC_NLA_NET_NODEID, /* u64 */
TIPC_NLA_NET_NODEID_W1, /* u64 */ TIPC_NLA_NET_NODEID_W1, /* u64 */
TIPC_NLA_NET_ADDR_LEGACY, /* flag */
__TIPC_NLA_NET_MAX, __TIPC_NLA_NET_MAX,
TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1 TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1