diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
| commit | feecb81732d8f271440d907beb082425e109f877 (patch) | |
| tree | af55ca33d43cf3b3c2b82e9860df7d01be061a0f /include/uapi/linux/psample.h | |
| parent | bd9a5fc2edb0bdcb0756298daa31ddd6a02f0634 (diff) | |
| parent | a5e13c6df0e41702d2b2c77c8ad41677ebb065b3 (diff) | |
| download | cachepc-linux-feecb81732d8f271440d907beb082425e109f877.tar.gz cachepc-linux-feecb81732d8f271440d907beb082425e109f877.zip | |
Merge tag 'v5.12-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/psample.h')
| -rw-r--r-- | include/uapi/linux/psample.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/uapi/linux/psample.h b/include/uapi/linux/psample.h index aea26ab1431c..bff5032c98df 100644 --- a/include/uapi/linux/psample.h +++ b/include/uapi/linux/psample.h @@ -3,7 +3,6 @@ #define __UAPI_PSAMPLE_H enum { - /* sampled packet metadata */ PSAMPLE_ATTR_IIFINDEX, PSAMPLE_ATTR_OIFINDEX, PSAMPLE_ATTR_ORIGSIZE, @@ -11,10 +10,8 @@ enum { PSAMPLE_ATTR_GROUP_SEQ, PSAMPLE_ATTR_SAMPLE_RATE, PSAMPLE_ATTR_DATA, - PSAMPLE_ATTR_TUNNEL, - - /* commands attributes */ PSAMPLE_ATTR_GROUP_REFCOUNT, + PSAMPLE_ATTR_TUNNEL, __PSAMPLE_ATTR_MAX }; |