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

update kernel headers to 3.19 net-next

This commit is contained in:
Stephen Hemminger 2015-01-13 17:39:32 -08:00
parent 9db7bf15e2
commit f233410d20
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/if_bridge.h
View File

@ -125,6 +125,8 @@ enum {
#define BRIDGE_VLAN_INFO_MASTER (1<<0) /* Operate on Bridge device as well */ #define BRIDGE_VLAN_INFO_MASTER (1<<0) /* Operate on Bridge device as well */
#define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */ #define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */
#define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */ #define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */
#define BRIDGE_VLAN_INFO_RANGE_BEGIN (1<<3) /* VLAN is start of vlan range */
#define BRIDGE_VLAN_INFO_RANGE_END (1<<4) /* VLAN is end of vlan range */
struct bridge_vlan_info { struct bridge_vlan_info {
__u16 flags; __u16 flags;

1
include/linux/l2tp.h
View File

@ -176,5 +176,6 @@ enum l2tp_seqmode {
*/ */
#define L2TP_GENL_NAME "l2tp" #define L2TP_GENL_NAME "l2tp"
#define L2TP_GENL_VERSION 0x1 #define L2TP_GENL_VERSION 0x1
#define L2TP_GENL_MCGROUP "l2tp"
#endif /* _LINUX_L2TP_H_ */ #endif /* _LINUX_L2TP_H_ */

6
include/linux/libc-compat.h
View File

@ -70,6 +70,8 @@
#define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPV6_MREQ 0
#define __UAPI_DEF_IPPROTO_V6 0 #define __UAPI_DEF_IPPROTO_V6 0
#define __UAPI_DEF_IPV6_OPTIONS 0 #define __UAPI_DEF_IPV6_OPTIONS 0
#define __UAPI_DEF_IN6_PKTINFO 0
#define __UAPI_DEF_IP6_MTUINFO 0
#else #else
@ -84,6 +86,8 @@
#define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPV6_MREQ 1
#define __UAPI_DEF_IPPROTO_V6 1 #define __UAPI_DEF_IPPROTO_V6 1
#define __UAPI_DEF_IPV6_OPTIONS 1 #define __UAPI_DEF_IPV6_OPTIONS 1
#define __UAPI_DEF_IN6_PKTINFO 1
#define __UAPI_DEF_IP6_MTUINFO 1
#endif /* _NETINET_IN_H */ #endif /* _NETINET_IN_H */
@ -106,6 +110,8 @@
#define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPV6_MREQ 1
#define __UAPI_DEF_IPPROTO_V6 1 #define __UAPI_DEF_IPPROTO_V6 1
#define __UAPI_DEF_IPV6_OPTIONS 1 #define __UAPI_DEF_IPV6_OPTIONS 1
#define __UAPI_DEF_IN6_PKTINFO 1
#define __UAPI_DEF_IP6_MTUINFO 1
/* Definitions for xattr.h */ /* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1 #define __UAPI_DEF_XATTR 1

3
include/linux/rtnetlink.h
View File

@ -389,6 +389,8 @@ enum {
#define RTAX_INITRWND RTAX_INITRWND #define RTAX_INITRWND RTAX_INITRWND
RTAX_QUICKACK, RTAX_QUICKACK,
#define RTAX_QUICKACK RTAX_QUICKACK #define RTAX_QUICKACK RTAX_QUICKACK
RTAX_CC_ALGO,
#define RTAX_CC_ALGO RTAX_CC_ALGO
__RTAX_MAX __RTAX_MAX
}; };
@ -632,6 +634,7 @@ struct tcamsg {
/* New extended info filters for IFLA_EXT_MASK */ /* New extended info filters for IFLA_EXT_MASK */
#define RTEXT_FILTER_VF (1 << 0) #define RTEXT_FILTER_VF (1 << 0)
#define RTEXT_FILTER_BRVLAN (1 << 1) #define RTEXT_FILTER_BRVLAN (1 << 1)
#define RTEXT_FILTER_BRVLAN_COMPRESSED (1 << 2)
/* End of information exported to user level */ /* End of information exported to user level */