proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-12-08 07:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into net-next

Browse Source
This commit is contained in:
Stephen Hemminger 2017-10-31 18:03:12 +01:00
commit c1606c44b3
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,7 +645,7 @@ union bpf_attr {
* @map: pointer to sockmap * @map: pointer to sockmap
* @key: key to lookup sock in map * @key: key to lookup sock in map
* @flags: reserved for future use * @flags: reserved for future use
* Return: SK_REDIRECT * Return: SK_PASS
* *
* int bpf_sock_map_update(skops, map, key, flags) * int bpf_sock_map_update(skops, map, key, flags)
* @skops: pointer to bpf_sock_ops * @skops: pointer to bpf_sock_ops
@ -887,8 +887,8 @@ struct xdp_md {
}; };
enum sk_action { enum sk_action {
SK_ABORTED = 0, SK_DROP = 0,
SK_DROP, SK_PASS,
SK_REDIRECT, SK_REDIRECT,
}; };

2
include/uapi/linux/sctp.h
View File

@ -378,7 +378,7 @@ struct sctp_remote_error {
__u16 sre_type; __u16 sre_type;
__u16 sre_flags; __u16 sre_flags;
__u32 sre_length; __u32 sre_length;
__u16 sre_error; __be16 sre_error;
sctp_assoc_t sre_assoc_id; sctp_assoc_t sre_assoc_id;
__u8 sre_data[0]; __u8 sre_data[0];
}; };

1
man/man8/ip-link.8.in
View File

@ -250,6 +250,7 @@ Link types:
.sp .sp
.B bond .B bond
- Bonding device - Bonding device
.sp
.B can .B can
- Controller Area Network interface - Controller Area Network interface
.sp .sp

2
tc/m_ife.c
View File

@ -93,7 +93,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
} else if (matches(*argv, "prio") == 0) { } else if (matches(*argv, "prio") == 0) {
ife_prio = IFE_META_PRIO; ife_prio = IFE_META_PRIO;
} else if (matches(*argv, "tcindex") == 0) { } else if (matches(*argv, "tcindex") == 0) {
ife_prio = IFE_META_TCINDEX; ife_tcindex = IFE_META_TCINDEX;
} else { } else {
fprintf(stderr, "Illegal meta define <%s>\n", fprintf(stderr, "Illegal meta define <%s>\n",
*argv); *argv);