This reverts commit 9ab7e76aefc97a9aa664accb59d6e8dc5e52514a. This patch was committed without maintainer approval and despite a number of unaddressed concerns from review. There are several issues that impede the acceptance of this patch and that make a reversion of this particular instance of these changes the best way forward: i) the patch contains several logically separate changes that would be better served as smaller patches (for review purposes) ii) functionality like the handling of end markers has been introduced without further explanation iii) symmetry between the handling of GTPv0 and GTPv1 has been unnecessarily broken iv) the patchset produces 'broken' packets when extension headers are included v) there are no available userspace tools to allow for testing this functionality vi) there is an unaddressed Coverity report against the patch concering memory leakage vii) most importantly, the patch contains a large amount of superfluous churn that impedes other ongoing work with this driver This patch will be reworked into a series that aligns with other ongoing work and facilitates review.
Showing the changes to include/uapi (3 of 5 files). Show all
Unified · Split
| @@ -2,8 +2,6 @@ · 1 unmodified line | |||
| 2 | #ifndef _UAPI_LINUX_GTP_H_ | 2 | #ifndef _UAPI_LINUX_GTP_H_ |
| 3 | #define _UAPI_LINUX_GTP_H_ | 3 | #define _UAPI_LINUX_GTP_H_ |
| 4 | 4 | ||
| 5 | #include <linux/types.h> | ||
| 6 | |||
| 7 | #define GTP_GENL_MCGRP_NAME "gtp" | 5 | #define GTP_GENL_MCGRP_NAME "gtp" |
| 8 | 6 | ||
| 9 | enum gtp_genl_cmds { | 7 | enum gtp_genl_cmds { |
| @@ -36,14 +34,4 @@ enum gtp_attrs { · 26 unmodified lines | |||
| 36 | }; | 34 | }; |
| 37 | #define GTPA_MAX (__GTPA_MAX + 1) | 35 | #define GTPA_MAX (__GTPA_MAX + 1) |
| 38 | 36 | ||
| 39 | enum { | ||
| 40 | GTP_METADATA_V1 | ||
| 41 | }; | ||
| 42 | |||
| 43 | struct gtpu_metadata { | ||
| 44 | __u8 ver; | ||
| 45 | __u8 flags; | ||
| 46 | __u8 type; | ||
| 47 | }; | ||
| 48 | |||
| 49 | #endif /* _UAPI_LINUX_GTP_H_ */ | 37 | #endif /* _UAPI_LINUX_GTP_H_ */ |
| @@ -811,7 +811,6 @@ enum { · 810 unmodified lines | |||
| 811 | IFLA_GTP_FD1, | 811 | IFLA_GTP_FD1, |
| 812 | IFLA_GTP_PDP_HASHSIZE, | 812 | IFLA_GTP_PDP_HASHSIZE, |
| 813 | IFLA_GTP_ROLE, | 813 | IFLA_GTP_ROLE, |
| 814 | IFLA_GTP_COLLECT_METADATA, | ||
| 815 | __IFLA_GTP_MAX, | 814 | __IFLA_GTP_MAX, |
| 816 | }; | 815 | }; |
| 817 | #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1) | 816 | #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1) |
| @@ -176,7 +176,6 @@ enum { · 175 unmodified lines | |||
| 176 | #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) | 176 | #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) |
| 177 | #define TUNNEL_NOCACHE __cpu_to_be16(0x2000) | 177 | #define TUNNEL_NOCACHE __cpu_to_be16(0x2000) |
| 178 | #define TUNNEL_ERSPAN_OPT __cpu_to_be16(0x4000) | 178 | #define TUNNEL_ERSPAN_OPT __cpu_to_be16(0x4000) |
| 179 | #define TUNNEL_GTPU_OPT __cpu_to_be16(0x8000) | ||
| 180 | 179 | ||
| 181 | #define TUNNEL_OPTIONS_PRESENT \ | 180 | #define TUNNEL_OPTIONS_PRESENT \ |
| 182 | (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT) | 181 | (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT) |