Commit cbdc3ed8 authored by Stephen Hemminger's avatar Stephen Hemminger

update kernel headers to net-next 4.0-rc5

Lastest features
parent b54ac87e
...@@ -119,6 +119,7 @@ enum bpf_prog_type { ...@@ -119,6 +119,7 @@ enum bpf_prog_type {
BPF_PROG_TYPE_UNSPEC, BPF_PROG_TYPE_UNSPEC,
BPF_PROG_TYPE_SOCKET_FILTER, BPF_PROG_TYPE_SOCKET_FILTER,
BPF_PROG_TYPE_SCHED_CLS, BPF_PROG_TYPE_SCHED_CLS,
BPF_PROG_TYPE_SCHED_ACT,
}; };
#define BPF_PSEUDO_MAP_FD 1 #define BPF_PSEUDO_MAP_FD 1
...@@ -178,6 +179,10 @@ struct __sk_buff { ...@@ -178,6 +179,10 @@ struct __sk_buff {
__u32 pkt_type; __u32 pkt_type;
__u32 mark; __u32 mark;
__u32 queue_mapping; __u32 queue_mapping;
__u32 protocol;
__u32 vlan_present;
__u32 vlan_tci;
__u32 vlan_proto;
}; };
#endif /* __LINUX_BPF_H__ */ #endif /* __LINUX_BPF_H__ */
...@@ -77,7 +77,8 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ ...@@ -77,7 +77,8 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
#define SKF_AD_VLAN_TAG_PRESENT 48 #define SKF_AD_VLAN_TAG_PRESENT 48
#define SKF_AD_PAY_OFFSET 52 #define SKF_AD_PAY_OFFSET 52
#define SKF_AD_RANDOM 56 #define SKF_AD_RANDOM 56
#define SKF_AD_MAX 60 #define SKF_AD_VLAN_TPID 60
#define SKF_AD_MAX 64
#define SKF_NET_OFF (-0x100000) #define SKF_NET_OFF (-0x100000)
#define SKF_LL_OFF (-0x200000) #define SKF_LL_OFF (-0x200000)
......
...@@ -51,6 +51,7 @@ enum { ...@@ -51,6 +51,7 @@ enum {
#define IFA_F_MANAGETEMPADDR 0x100 #define IFA_F_MANAGETEMPADDR 0x100
#define IFA_F_NOPREFIXROUTE 0x200 #define IFA_F_NOPREFIXROUTE 0x200
#define IFA_F_MCAUTOJOIN 0x400 #define IFA_F_MCAUTOJOIN 0x400
#define IFA_F_STABLE_PRIVACY 0x800
struct ifa_cacheinfo { struct ifa_cacheinfo {
__u32 ifa_prefered; __u32 ifa_prefered;
......
...@@ -147,6 +147,7 @@ enum { ...@@ -147,6 +147,7 @@ enum {
IFLA_CARRIER_CHANGES, IFLA_CARRIER_CHANGES,
IFLA_PHYS_SWITCH_ID, IFLA_PHYS_SWITCH_ID,
IFLA_LINK_NETNSID, IFLA_LINK_NETNSID,
IFLA_PHYS_PORT_NAME,
__IFLA_MAX __IFLA_MAX
}; };
...@@ -213,6 +214,7 @@ enum { ...@@ -213,6 +214,7 @@ enum {
enum in6_addr_gen_mode { enum in6_addr_gen_mode {
IN6_ADDR_GEN_MODE_EUI64, IN6_ADDR_GEN_MODE_EUI64,
IN6_ADDR_GEN_MODE_NONE, IN6_ADDR_GEN_MODE_NONE,
IN6_ADDR_GEN_MODE_STABLE_PRIVACY,
}; };
/* Bridge section */ /* Bridge section */
...@@ -222,6 +224,9 @@ enum { ...@@ -222,6 +224,9 @@ enum {
IFLA_BR_FORWARD_DELAY, IFLA_BR_FORWARD_DELAY,
IFLA_BR_HELLO_TIME, IFLA_BR_HELLO_TIME,
IFLA_BR_MAX_AGE, IFLA_BR_MAX_AGE,
IFLA_BR_AGEING_TIME,
IFLA_BR_STP_STATE,
IFLA_BR_PRIORITY,
__IFLA_BR_MAX, __IFLA_BR_MAX,
}; };
......
...@@ -126,6 +126,7 @@ enum { ...@@ -126,6 +126,7 @@ enum {
NDTPA_PROXY_QLEN, /* u32 */ NDTPA_PROXY_QLEN, /* u32 */
NDTPA_LOCKTIME, /* u64, msecs */ NDTPA_LOCKTIME, /* u64, msecs */
NDTPA_QUEUE_LENBYTES, /* u32 */ NDTPA_QUEUE_LENBYTES, /* u32 */
NDTPA_MCAST_REPROBES, /* u32 */
__NDTPA_MAX __NDTPA_MAX
}; };
#define NDTPA_MAX (__NDTPA_MAX - 1) #define NDTPA_MAX (__NDTPA_MAX - 1)
......
...@@ -24,6 +24,8 @@ enum { ...@@ -24,6 +24,8 @@ enum {
TCA_ACT_BPF_PARMS, TCA_ACT_BPF_PARMS,
TCA_ACT_BPF_OPS_LEN, TCA_ACT_BPF_OPS_LEN,
TCA_ACT_BPF_OPS, TCA_ACT_BPF_OPS,
TCA_ACT_BPF_FD,
TCA_ACT_BPF_NAME,
__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)
......
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