On 10/31/16 11:00 AM, Daniel Mack wrote: > On 10/31/2016 05:58 PM, David Miller wrote: >> From: David Ahern <d...@cumulusnetworks.com> >> Date: Wed, 26 Oct 2016 17:58:38 -0700 >> >>> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h >>> index 6b62ee9a2f78..73da296c2125 100644 >>> --- a/include/uapi/linux/bpf.h >>> +++ b/include/uapi/linux/bpf.h >>> @@ -98,7 +98,7 @@ enum bpf_prog_type { >>> BPF_PROG_TYPE_TRACEPOINT, >>> BPF_PROG_TYPE_XDP, >>> BPF_PROG_TYPE_PERF_EVENT, >>> - BPF_PROG_TYPE_CGROUP_SKB, >>> + BPF_PROG_TYPE_CGROUP, >>> }; >>> >>> enum bpf_attach_type { >> >> If we do this then the cgroup-bpf series should use this value rather than >> changing it after-the-fact in your series here. >> > > Yeah, I'm confused too. I changed that name in my v7 from > BPF_PROG_TYPE_CGROUP_SOCK to BPF_PROG_TYPE_CGROUP_SKB on David's (Ahern) > request. Why is it now renamed again?
Thomas pushed back on adding another program type in favor of using subtypes. So this makes the program type generic to CGROUP and patch 2 in this v2 set added Mickaƫl's subtype patch with the socket mangling done that way in patch 3.