proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-06 21:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update kernel headers

Browse Source 
Update from 4.6-rc3
This commit is contained in:
Stephen Hemminger 2016-04-11 13:40:40 -07:00
parent 3273e3c132
commit 6268b08c13
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/bpf.h
View File

@ -375,6 +375,7 @@ struct bpf_tunnel_key {
}; };
__u8 tunnel_tos; __u8 tunnel_tos;
__u8 tunnel_ttl; __u8 tunnel_ttl;
__u16 tunnel_ext;
__u32 tunnel_label; __u32 tunnel_label;
}; };

9
include/linux/if_link.h
View File

@ -153,6 +153,8 @@ enum {
IFLA_LINK_NETNSID, IFLA_LINK_NETNSID,
IFLA_PHYS_PORT_NAME, IFLA_PHYS_PORT_NAME,
IFLA_PROTO_DOWN, IFLA_PROTO_DOWN,
IFLA_GSO_MAX_SEGS,
IFLA_GSO_MAX_SIZE,
__IFLA_MAX __IFLA_MAX
}; };
@ -597,6 +599,8 @@ enum {
*/ */
IFLA_VF_STATS, /* network device statistics */ IFLA_VF_STATS, /* network device statistics */
IFLA_VF_TRUST, /* Trust VF */ IFLA_VF_TRUST, /* Trust VF */
IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */
IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
__IFLA_VF_MAX, __IFLA_VF_MAX,
}; };
@ -629,6 +633,11 @@ struct ifla_vf_spoofchk {
__u32 setting; __u32 setting;
}; };
struct ifla_vf_guid {
__u32 vf;
__u64 guid;
};
enum { enum {
IFLA_VF_LINK_STATE_AUTO, /* link state of the uplink */ IFLA_VF_LINK_STATE_AUTO, /* link state of the uplink */
IFLA_VF_LINK_STATE_ENABLE, /* link always up */ IFLA_VF_LINK_STATE_ENABLE, /* link always up */