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

update kernel headers to 4.2-net-next

This commit is contained in:
Stephen Hemminger 2015-08-31 16:35:00 -07:00
parent f1e225beef
commit 8d62f3e294
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/if_link.h
View File

@ -229,6 +229,7 @@ enum {
IFLA_BR_STP_STATE, IFLA_BR_STP_STATE,
IFLA_BR_PRIORITY, IFLA_BR_PRIORITY,
IFLA_BR_VLAN_FILTERING, IFLA_BR_VLAN_FILTERING,
IFLA_BR_VLAN_PROTOCOL,
__IFLA_BR_MAX, __IFLA_BR_MAX,
}; };
@ -407,6 +408,8 @@ enum {
IFLA_GENEVE_REMOTE, IFLA_GENEVE_REMOTE,
IFLA_GENEVE_TTL, IFLA_GENEVE_TTL,
IFLA_GENEVE_TOS, IFLA_GENEVE_TOS,
IFLA_GENEVE_PORT, /* destination port */
IFLA_GENEVE_COLLECT_METADATA,
__IFLA_GENEVE_MAX __IFLA_GENEVE_MAX
}; };
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)

1
include/linux/netlink.h
View File

@ -110,6 +110,7 @@ struct nlmsgerr {
#define NETLINK_TX_RING 7 #define NETLINK_TX_RING 7
#define NETLINK_LISTEN_ALL_NSID 8 #define NETLINK_LISTEN_ALL_NSID 8
#define NETLINK_LIST_MEMBERSHIPS 9 #define NETLINK_LIST_MEMBERSHIPS 9
#define NETLINK_CAP_ACK 10
struct nl_pktinfo { struct nl_pktinfo {
__u32 group; __u32 group;

11
include/linux/rtnetlink.h
View File

@ -418,10 +418,13 @@ enum {
#define RTAX_MAX (__RTAX_MAX - 1) #define RTAX_MAX (__RTAX_MAX - 1)
#define RTAX_FEATURE_ECN 0x00000001 #define RTAX_FEATURE_ECN (1 << 0)
#define RTAX_FEATURE_SACK 0x00000002 #define RTAX_FEATURE_SACK (1 << 1)
#define RTAX_FEATURE_TIMESTAMP 0x00000004 #define RTAX_FEATURE_TIMESTAMP (1 << 2)
#define RTAX_FEATURE_ALLFRAG 0x00000008 #define RTAX_FEATURE_ALLFRAG (1 << 3)
#define RTAX_FEATURE_MASK (RTAX_FEATURE_ECN | RTAX_FEATURE_SACK | \
RTAX_FEATURE_TIMESTAMP | RTAX_FEATURE_ALLFRAG)
struct rta_session { struct rta_session {
__u8 proto; __u8 proto;