proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-05 20:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update kernel headers from 4.14-rc7 net-next

Browse Source
This commit is contained in:
Stephen Hemminger 2017-11-01 22:15:50 +01:00
parent 5ee63855dc
commit fe388b9e0c
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/uapi/linux/bpf.h
View File

@ -645,7 +645,7 @@ union bpf_attr {
* @map: pointer to sockmap * @map: pointer to sockmap
* @key: key to lookup sock in map * @key: key to lookup sock in map
* @flags: reserved for future use * @flags: reserved for future use
* Return: SK_REDIRECT * Return: SK_PASS
* *
* int bpf_sock_map_update(skops, map, key, flags) * int bpf_sock_map_update(skops, map, key, flags)
* @skops: pointer to bpf_sock_ops * @skops: pointer to bpf_sock_ops
@ -887,8 +887,8 @@ struct xdp_md {
}; };
enum sk_action { enum sk_action {
SK_ABORTED = 0, SK_DROP = 0,
SK_DROP, SK_PASS,
SK_REDIRECT, SK_REDIRECT,
}; };

4
include/uapi/linux/if_link.h
View File

@ -463,6 +463,7 @@ enum macsec_validation_type {
enum { enum {
IFLA_IPVLAN_UNSPEC, IFLA_IPVLAN_UNSPEC,
IFLA_IPVLAN_MODE, IFLA_IPVLAN_MODE,
IFLA_IPVLAN_FLAGS,
__IFLA_IPVLAN_MAX __IFLA_IPVLAN_MAX
}; };
@ -475,6 +476,9 @@ enum ipvlan_mode {
IPVLAN_MODE_MAX IPVLAN_MODE_MAX
}; };
#define IPVLAN_F_PRIVATE 0x01
#define IPVLAN_F_VEPA 0x02
/* VXLAN section */ /* VXLAN section */
enum { enum {
IFLA_VXLAN_UNSPEC, IFLA_VXLAN_UNSPEC,

19
include/uapi/linux/pkt_sched.h
View File

@ -904,4 +904,23 @@ struct tc_pie_xstats {
__u32 maxq; /* maximum queue size */ __u32 maxq; /* maximum queue size */
__u32 ecn_mark; /* packets marked with ecn*/ __u32 ecn_mark; /* packets marked with ecn*/
}; };
/* CBS */
struct tc_cbs_qopt {
__u8 offload;
__u8 _pad[3];
__s32 hicredit;
__s32 locredit;
__s32 idleslope;
__s32 sendslope;
};
enum {
TCA_CBS_UNSPEC,
TCA_CBS_PARMS,
__TCA_CBS_MAX,
};
#define TCA_CBS_MAX (__TCA_CBS_MAX - 1)
#endif #endif

2
include/uapi/linux/sctp.h
View File

@ -378,7 +378,7 @@ struct sctp_remote_error {
__u16 sre_type; __u16 sre_type;
__u16 sre_flags; __u16 sre_flags;
__u32 sre_length; __u32 sre_length;
__u16 sre_error; __be16 sre_error;
sctp_assoc_t sre_assoc_id; sctp_assoc_t sre_assoc_id;
__u8 sre_data[0]; __u8 sre_data[0];
}; };