matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update kernel headers from net-next

This commit is contained in:
Stephen Hemminger 2016-04-22 10:01:12 -07:00
parent 8b5be9ecff
commit 32c0b9b7a8
5 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/bpf.h
View File

@ -347,6 +347,10 @@ enum bpf_func_id {
#define BPF_F_ZERO_CSUM_TX (1ULL << 1) #define BPF_F_ZERO_CSUM_TX (1ULL << 1)
#define BPF_F_DONT_FRAGMENT (1ULL << 2) #define BPF_F_DONT_FRAGMENT (1ULL << 2)
/* BPF_FUNC_perf_event_output flags. */
#define BPF_F_INDEX_MASK 0xffffffffULL
#define BPF_F_CURRENT_CPU BPF_F_INDEX_MASK
/* user accessible mirror of in-kernel sk_buff. /* user accessible mirror of in-kernel sk_buff.
* new fields can only be added to the end of this structure * new fields can only be added to the end of this structure
*/ */

6
include/linux/devlink.h
View File

@ -9,8 +9,8 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#ifndef _UAPI_LINUX_DEVLINK_H_ #ifndef _LINUX_DEVLINK_H_
#define _UAPI_LINUX_DEVLINK_H_ #define _LINUX_DEVLINK_H_
#define DEVLINK_GENL_NAME "devlink" #define DEVLINK_GENL_NAME "devlink"
#define DEVLINK_GENL_VERSION 0x1 #define DEVLINK_GENL_VERSION 0x1
@ -132,4 +132,4 @@ enum devlink_attr {
DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1 DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
}; };
#endif /* _UAPI_LINUX_DEVLINK_H_ */ #endif /* _LINUX_DEVLINK_H_ */

1
include/linux/if_ether.h
View File

@ -92,6 +92,7 @@
#define ETH_P_TDLS 0x890D /* TDLS */ #define ETH_P_TDLS 0x890D /* TDLS */
#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ #define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
#define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */ #define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */
#define ETH_P_HSR 0x892F /* IEC 62439-3 HSRv1 */
#define ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */ #define ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */
#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

25
include/linux/if_link.h
View File

@ -155,6 +155,7 @@ enum {
IFLA_PROTO_DOWN, IFLA_PROTO_DOWN,
IFLA_GSO_MAX_SEGS, IFLA_GSO_MAX_SEGS,
IFLA_GSO_MAX_SIZE, IFLA_GSO_MAX_SIZE,
IFLA_PAD,
__IFLA_MAX __IFLA_MAX
}; };
@ -773,9 +774,33 @@ enum {
IFLA_HSR_MULTICAST_SPEC, /* Last byte of supervision addr */ IFLA_HSR_MULTICAST_SPEC, /* Last byte of supervision addr */
IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */ IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */
IFLA_HSR_SEQ_NR, IFLA_HSR_SEQ_NR,
IFLA_HSR_VERSION, /* HSR version */
__IFLA_HSR_MAX, __IFLA_HSR_MAX,
}; };
#define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1) #define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
/* STATS section */
struct if_stats_msg {
__u8 family;
__u8 pad1;
__u16 pad2;
__u32 ifindex;
__u32 filter_mask;
};
/* A stats attribute can be netdev specific or a global stat.
* For netdev stats, lets use the prefix IFLA_STATS_LINK_*
*/
enum {
IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
IFLA_STATS_LINK_64,
__IFLA_STATS_MAX,
};
#define IFLA_STATS_MAX (__IFLA_STATS_MAX - 1)
#define IFLA_STATS_FILTER_BIT(ATTR) (1 << (ATTR - 1))
#endif /* _LINUX_IF_LINK_H */ #endif /* _LINUX_IF_LINK_H */

6
include/linux/rtnetlink.h
View File

@ -139,6 +139,11 @@ enum {
RTM_GETNSID = 90, RTM_GETNSID = 90,
#define RTM_GETNSID RTM_GETNSID #define RTM_GETNSID RTM_GETNSID
RTM_NEWSTATS = 92,
#define RTM_NEWSTATS RTM_NEWSTATS
RTM_GETSTATS = 94,
#define RTM_GETSTATS RTM_GETSTATS
__RTM_MAX, __RTM_MAX,
#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
}; };
@ -312,6 +317,7 @@ enum rtattr_type_t {
RTA_ENCAP_TYPE, RTA_ENCAP_TYPE,
RTA_ENCAP, RTA_ENCAP,
RTA_EXPIRES, RTA_EXPIRES,
RTA_PAD,
__RTA_MAX __RTA_MAX
}; };