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

update headers from net-next 

Get TCA_DUMP_INVISIBLE and SCTP changes.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-03-14 16:36:15 -07:00
parent 8fded9ffad
commit 2099b98385
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mpls_iptunnel.h
View File

@ -16,11 +16,13 @@
/* MPLS tunnel attributes /* MPLS tunnel attributes
* [RTA_ENCAP] = { * [RTA_ENCAP] = {
* [MPLS_IPTUNNEL_DST] * [MPLS_IPTUNNEL_DST]
* [MPLS_IPTUNNEL_TTL]
* } * }
*/ */
enum { enum {
MPLS_IPTUNNEL_UNSPEC, MPLS_IPTUNNEL_UNSPEC,
MPLS_IPTUNNEL_DST, MPLS_IPTUNNEL_DST,
MPLS_IPTUNNEL_TTL,
__MPLS_IPTUNNEL_MAX, __MPLS_IPTUNNEL_MAX,
}; };
#define MPLS_IPTUNNEL_MAX (__MPLS_IPTUNNEL_MAX - 1) #define MPLS_IPTUNNEL_MAX (__MPLS_IPTUNNEL_MAX - 1)

2
include/linux/rtnetlink.h
View File

@ -319,6 +319,7 @@ enum rtattr_type_t {
RTA_EXPIRES, RTA_EXPIRES,
RTA_PAD, RTA_PAD,
RTA_UID, RTA_UID,
RTA_TTL_PROPAGATE,
__RTA_MAX __RTA_MAX
}; };
@ -545,6 +546,7 @@ enum {
TCA_STATS2, TCA_STATS2,
TCA_STAB, TCA_STAB,
TCA_PAD, TCA_PAD,
TCA_DUMP_INVISIBLE,
__TCA_MAX __TCA_MAX
}; };

31
include/linux/sctp.h
View File

@ -115,6 +115,7 @@ typedef __s32 sctp_assoc_t;
#define SCTP_PR_SUPPORTED 113 #define SCTP_PR_SUPPORTED 113
#define SCTP_DEFAULT_PRINFO 114 #define SCTP_DEFAULT_PRINFO 114
#define SCTP_PR_ASSOC_STATUS 115 #define SCTP_PR_ASSOC_STATUS 115
#define SCTP_RECONFIG_SUPPORTED 117
#define SCTP_ENABLE_STREAM_RESET 118 #define SCTP_ENABLE_STREAM_RESET 118
#define SCTP_RESET_STREAMS 119 #define SCTP_RESET_STREAMS 119
#define SCTP_RESET_ASSOC 120 #define SCTP_RESET_ASSOC 120
@ -502,6 +503,28 @@ struct sctp_stream_reset_event {
__u16 strreset_stream_list[]; __u16 strreset_stream_list[];
}; };
#define SCTP_ASSOC_RESET_DENIED 0x0004
#define SCTP_ASSOC_RESET_FAILED 0x0008
struct sctp_assoc_reset_event {
__u16 assocreset_type;
__u16 assocreset_flags;
__u32 assocreset_length;
sctp_assoc_t assocreset_assoc_id;
__u32 assocreset_local_tsn;
__u32 assocreset_remote_tsn;
};
#define SCTP_ASSOC_CHANGE_DENIED 0x0004
#define SCTP_ASSOC_CHANGE_FAILED 0x0008
struct sctp_stream_change_event {
__u16 strchange_type;
__u16 strchange_flags;
__u32 strchange_length;
sctp_assoc_t strchange_assoc_id;
__u16 strchange_instrms;
__u16 strchange_outstrms;
};
/* /*
* Described in Section 7.3 * Described in Section 7.3
* Ancillary Data and Notification Interest Options * Ancillary Data and Notification Interest Options
@ -518,6 +541,8 @@ struct sctp_event_subscribe {
__u8 sctp_authentication_event; __u8 sctp_authentication_event;
__u8 sctp_sender_dry_event; __u8 sctp_sender_dry_event;
__u8 sctp_stream_reset_event; __u8 sctp_stream_reset_event;
__u8 sctp_assoc_reset_event;
__u8 sctp_stream_change_event;
}; };
/* /*
@ -543,6 +568,8 @@ union sctp_notification {
struct sctp_authkey_event sn_authkey_event; struct sctp_authkey_event sn_authkey_event;
struct sctp_sender_dry_event sn_sender_dry_event; struct sctp_sender_dry_event sn_sender_dry_event;
struct sctp_stream_reset_event sn_strreset_event; struct sctp_stream_reset_event sn_strreset_event;
struct sctp_assoc_reset_event sn_assocreset_event;
struct sctp_stream_change_event sn_strchange_event;
}; };
/* Section 5.3.1 /* Section 5.3.1
@ -572,6 +599,10 @@ enum sctp_sn_type {
#define SCTP_SENDER_DRY_EVENT SCTP_SENDER_DRY_EVENT #define SCTP_SENDER_DRY_EVENT SCTP_SENDER_DRY_EVENT
SCTP_STREAM_RESET_EVENT, SCTP_STREAM_RESET_EVENT,
#define SCTP_STREAM_RESET_EVENT SCTP_STREAM_RESET_EVENT #define SCTP_STREAM_RESET_EVENT SCTP_STREAM_RESET_EVENT
SCTP_ASSOC_RESET_EVENT,
#define SCTP_ASSOC_RESET_EVENT SCTP_ASSOC_RESET_EVENT
SCTP_STREAM_CHANGE_EVENT,
#define SCTP_STREAM_CHANGE_EVENT SCTP_STREAM_CHANGE_EVENT
}; };
/* Notification error codes used to fill up the error fields in some /* Notification error codes used to fill up the error fields in some