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

Update kernel headers 

Update kernel headers to commit 53a7bdfb2a27
("dt-bindings: dsa: Remove unnecessary #address/#size-cells")

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2018-05-09 20:52:52 -07:00
parent 0c0394ff83
commit fd95ec0e8e
4 changed files with 1447 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1756
include/uapi/linux/bpf.h
View File

File diff suppressed because it is too large Load Diff

11
include/uapi/linux/tcp.h
View File

@ -122,6 +122,10 @@ enum {
#define TCP_MD5SIG_EXT 32 /* TCP MD5 Signature with extensions */ #define TCP_MD5SIG_EXT 32 /* TCP MD5 Signature with extensions */
#define TCP_FASTOPEN_KEY 33 /* Set the key for Fast Open (cookie) */ #define TCP_FASTOPEN_KEY 33 /* Set the key for Fast Open (cookie) */
#define TCP_FASTOPEN_NO_COOKIE 34 /* Enable TFO without a TFO cookie */ #define TCP_FASTOPEN_NO_COOKIE 34 /* Enable TFO without a TFO cookie */
#define TCP_ZEROCOPY_RECEIVE 35
#define TCP_INQ 36 /* Notify bytes available to read as a cmsg on read */
#define TCP_CM_INQ TCP_INQ
struct tcp_repair_opt { struct tcp_repair_opt {
__u32 opt_code; __u32 opt_code;
@ -276,4 +280,11 @@ struct tcp_diag_md5sig {
__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN]; __u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN];
}; };
/* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */
struct tcp_zerocopy_receive {
__u64 address; /* in: address of mapping */
__u32 length; /* in/out: number of bytes to map/mapped */
__u32 recv_skip_hint; /* out: amount of bytes to skip */
};
#endif /* _LINUX_TCP_H */ #endif /* _LINUX_TCP_H */

12
include/uapi/linux/tipc.h
View File

@ -209,16 +209,16 @@ struct tipc_group_req {
* The string formatting for each name element is: * The string formatting for each name element is:
* media: media * media: media
* interface: media:interface name * interface: media:interface name
* link: Z.C.N:interface-Z.C.N:interface * link: node:interface-node:interface
*
*/ */
#define TIPC_NODEID_LEN 16
#define TIPC_MAX_MEDIA_NAME 16 #define TIPC_MAX_MEDIA_NAME 16
#define TIPC_MAX_IF_NAME 16 #define TIPC_MAX_IF_NAME 16
#define TIPC_MAX_BEARER_NAME 32 #define TIPC_MAX_BEARER_NAME 32
#define TIPC_MAX_LINK_NAME 68 #define TIPC_MAX_LINK_NAME 68
#define SIOCGETLINKNAME SIOCPROTOPRIVATE #define SIOCGETLINKNAME SIOCPROTOPRIVATE
#define SIOCGETNODEID (SIOCPROTOPRIVATE + 1)
struct tipc_sioc_ln_req { struct tipc_sioc_ln_req {
__u32 peer; __u32 peer;
@ -226,6 +226,10 @@ struct tipc_sioc_ln_req {
char linkname[TIPC_MAX_LINK_NAME]; char linkname[TIPC_MAX_LINK_NAME];
}; };
struct tipc_sioc_nodeid_req {
__u32 peer;
char node_id[TIPC_NODEID_LEN];
};
/* The macros and functions below are deprecated: /* The macros and functions below are deprecated:
*/ */

1
include/uapi/linux/tipc_netlink.h
View File

@ -266,6 +266,7 @@ enum {
TIPC_NLA_PROP_PRIO, /* u32 */ TIPC_NLA_PROP_PRIO, /* u32 */
TIPC_NLA_PROP_TOL, /* u32 */ TIPC_NLA_PROP_TOL, /* u32 */
TIPC_NLA_PROP_WIN, /* u32 */ TIPC_NLA_PROP_WIN, /* u32 */
TIPC_NLA_PROP_MTU, /* u32 */
__TIPC_NLA_PROP_MAX, __TIPC_NLA_PROP_MAX,
TIPC_NLA_PROP_MAX = __TIPC_NLA_PROP_MAX - 1 TIPC_NLA_PROP_MAX = __TIPC_NLA_PROP_MAX - 1