From 103bc5f11da9b9f7bb4ca0fb187aa13d1135ad76 Mon Sep 17 00:00:00 2001 From: Roman Mashak Date: Fri, 27 Oct 2017 15:05:34 -0400 Subject: [PATCH 1/3] ip: added missing newline in man page Signed-off-by: Roman Mashak --- man/man8/ip-link.8.in | 1 + 1 file changed, 1 insertion(+) diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 851b308c..d96ee288 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -250,6 +250,7 @@ Link types: .sp .B bond - Bonding device +.sp .B can - Controller Area Network interface .sp From 25a24934ab77436fae1a0ba076aac16350191ead Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Mon, 30 Oct 2017 12:37:49 -0400 Subject: [PATCH 2/3] tc: m_ife: fix match tcindex parsing This patch changes ife_prio to ife_tcindex which is right variable to assign in the argument in this case. Signed-off-by: Alexander Aring --- tc/m_ife.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc/m_ife.c b/tc/m_ife.c index 5633ab90..8d0fd31f 100644 --- a/tc/m_ife.c +++ b/tc/m_ife.c @@ -93,7 +93,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, } else if (matches(*argv, "prio") == 0) { ife_prio = IFE_META_PRIO; } else if (matches(*argv, "tcindex") == 0) { - ife_prio = IFE_META_TCINDEX; + ife_tcindex = IFE_META_TCINDEX; } else { fprintf(stderr, "Illegal meta define <%s>\n", *argv); From e3488892897dbd4c7b33f7899f768c75893aff6d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 31 Oct 2017 18:01:51 +0100 Subject: [PATCH 3/3] Update kernel headers based on 4.14-rc7 Signed-off-by: Stephen Hemminger --- include/uapi/linux/bpf.h | 8 ++++---- include/uapi/linux/sctp.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 0895a529..e6d520bd 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -312,7 +312,7 @@ union bpf_attr { * jump into another BPF program * @ctx: context pointer passed to next program * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY - * @index: index inside array that selects specific program to run + * @index: 32-bit index inside array that selects specific program to run * Return: 0 on success or negative error * * int bpf_clone_redirect(skb, ifindex, flags) @@ -575,7 +575,7 @@ union bpf_attr { * @map: pointer to sockmap * @key: key to lookup sock in map * @flags: reserved for future use - * Return: SK_REDIRECT + * Return: SK_PASS * * int bpf_sock_map_update(skops, map, key, flags) * @skops: pointer to bpf_sock_ops @@ -786,8 +786,8 @@ struct xdp_md { }; enum sk_action { - SK_ABORTED = 0, - SK_DROP, + SK_DROP = 0, + SK_PASS, SK_REDIRECT, }; diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h index fec24c41..39922b7a 100644 --- a/include/uapi/linux/sctp.h +++ b/include/uapi/linux/sctp.h @@ -376,7 +376,7 @@ struct sctp_remote_error { __u16 sre_type; __u16 sre_flags; __u32 sre_length; - __u16 sre_error; + __be16 sre_error; sctp_assoc_t sre_assoc_id; __u8 sre_data[0]; };