* [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in bpf.h
@ 2019-04-12 11:27 Alan Maguire
2019-04-12 16:08 ` Song Liu
2019-04-16 8:27 ` Daniel Borkmann
0 siblings, 2 replies; 3+ messages in thread
From: Alan Maguire @ 2019-04-12 11:27 UTC (permalink / raw)
To: ast, daniel
Cc: kafai, songliubraving, yhs, quentin.monnet, john.fastabend, rdna,
netdev, bpf, Alan Maguire
replace tab after #define with space in line with rest of definitions
Signed-off-by: Alan Maguire <alan.maguire@oracle.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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in bpf.h
2019-04-12 11:27 [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in bpf.h Alan Maguire
@ 2019-04-12 16:08 ` Song Liu
2019-04-16 8:27 ` Daniel Borkmann
1 sibling, 0 replies; 3+ messages in thread
From: Song Liu @ 2019-04-12 16:08 UTC (permalink / raw)
To: Alan Maguire
Cc: Alexei Starovoitov, Daniel Borkmann, Martin Lau, Yonghong Song,
Quentin Monnet, john.fastabend, Andrey Ignatov, netdev, bpf
> On Apr 12, 2019, at 4:27 AM, Alan Maguire <alan.maguire@oracle.com> wrote:
>
> replace tab after #define with space in line with rest of definitions
>
> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
Acked-by: Song Liu <songliubraving@fb.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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in bpf.h
2019-04-12 11:27 [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in bpf.h Alan Maguire
2019-04-12 16:08 ` Song Liu
@ 2019-04-16 8:27 ` Daniel Borkmann
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2019-04-16 8:27 UTC (permalink / raw)
To: Alan Maguire, ast
Cc: kafai, songliubraving, yhs, quentin.monnet, john.fastabend, rdna,
netdev, bpf
On 04/12/2019 01:27 PM, Alan Maguire wrote:
> replace tab after #define with space in line with rest of definitions
>
> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-16 8:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-12 11:27 [PATCH bpf-next] bpf: fix whitespace for ENCAP_L2 defines in bpf.h Alan Maguire
2019-04-12 16:08 ` Song Liu
2019-04-16 8:27 ` Daniel Borkmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.