[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <C7F0DF3C-260F-4FA1-BE9A-A34325EF3D03@fb.com>
Date: Fri, 12 Apr 2019 16:08:23 +0000
From: Song Liu <songliubraving@...com>
To: Alan Maguire <alan.maguire@...cle.com>
CC: Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Martin Lau <kafai@...com>, Yonghong Song <yhs@...com>,
Quentin Monnet <quentin.monnet@...ronome.com>,
"john.fastabend@...il.com" <john.fastabend@...il.com>,
Andrey Ignatov <rdna@...com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"bpf@...r.kernel.org" <bpf@...r.kernel.org>
Subject: Re: [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in
bpf.h
> On Apr 12, 2019, at 4:27 AM, Alan Maguire <alan.maguire@...cle.com> wrote:
>
> replace tab after #define with space in line with rest of definitions
>
> Signed-off-by: Alan Maguire <alan.maguire@...cle.com>
Acked-by: Song Liu <songliubraving@...com>
> ---
> include/uapi/linux/bpf.h | 6 +++---
> tools/include/uapi/linux/bpf.h | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> index 2e96d0b..dacf3fc 100644
> --- a/include/uapi/linux/bpf.h
> +++ b/include/uapi/linux/bpf.h
> @@ -2668,14 +2668,14 @@ enum bpf_func_id {
> /* BPF_FUNC_skb_adjust_room flags. */
> #define BPF_F_ADJ_ROOM_FIXED_GSO (1ULL << 0)
>
> -#define BPF_ADJ_ROOM_ENCAP_L2_MASK 0xff
> -#define BPF_ADJ_ROOM_ENCAP_L2_SHIFT 56
> +#define BPF_ADJ_ROOM_ENCAP_L2_MASK 0xff
> +#define BPF_ADJ_ROOM_ENCAP_L2_SHIFT 56
>
> #define BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 (1ULL << 1)
> #define BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 (1ULL << 2)
> #define BPF_F_ADJ_ROOM_ENCAP_L4_GRE (1ULL << 3)
> #define BPF_F_ADJ_ROOM_ENCAP_L4_UDP (1ULL << 4)
> -#define BPF_F_ADJ_ROOM_ENCAP_L2(len) (((__u64)len & \
> +#define BPF_F_ADJ_ROOM_ENCAP_L2(len) (((__u64)len & \
> BPF_ADJ_ROOM_ENCAP_L2_MASK) \
> << BPF_ADJ_ROOM_ENCAP_L2_SHIFT)
>
> diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> index 2e96d0b..dacf3fc 100644
> --- a/tools/include/uapi/linux/bpf.h
> +++ b/tools/include/uapi/linux/bpf.h
> @@ -2668,14 +2668,14 @@ enum bpf_func_id {
> /* BPF_FUNC_skb_adjust_room flags. */
> #define BPF_F_ADJ_ROOM_FIXED_GSO (1ULL << 0)
>
> -#define BPF_ADJ_ROOM_ENCAP_L2_MASK 0xff
> -#define BPF_ADJ_ROOM_ENCAP_L2_SHIFT 56
> +#define BPF_ADJ_ROOM_ENCAP_L2_MASK 0xff
> +#define BPF_ADJ_ROOM_ENCAP_L2_SHIFT 56
>
> #define BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 (1ULL << 1)
> #define BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 (1ULL << 2)
> #define BPF_F_ADJ_ROOM_ENCAP_L4_GRE (1ULL << 3)
> #define BPF_F_ADJ_ROOM_ENCAP_L4_UDP (1ULL << 4)
> -#define BPF_F_ADJ_ROOM_ENCAP_L2(len) (((__u64)len & \
> +#define BPF_F_ADJ_ROOM_ENCAP_L2(len) (((__u64)len & \
> BPF_ADJ_ROOM_ENCAP_L2_MASK) \
> << BPF_ADJ_ROOM_ENCAP_L2_SHIFT)
>
> --
> 1.8.3.1
>
Powered by blists - more mailing lists