Remove the definition of IP_CT_NEW_REPLY from the kernel as it does not make sense. This allows the definition of IP_CT_NUMBER to be simplified as well.
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -20,9 +20,15 @@ enum ip_conntrack_info { · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY, |
| 22 | 22 | IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY, |
| 23 | − IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY, | |
| 24 | − /* Number of distinct IP_CT types (no NEW in reply dirn). */ | |
| 25 | − IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 | |
| 23 | + /* No NEW in reply direction. */ | |
| 24 | + | |
| 25 | + /* Number of distinct IP_CT types. */ | |
| 26 | + IP_CT_NUMBER, | |
| 27 | + | |
| 28 | + /* only for userspace compatibility */ | |
| 29 | +#ifndef __KERNEL__ | |
| 30 | + IP_CT_NEW_REPLY = IP_CT_NUMBER, | |
| 31 | +#endif | |
| 26 | 32 | }; |
| 27 | 33 | |
| 28 | 34 | #define NF_CT_STATE_INVALID_BIT (1 << 0) |