No conflicts.
Showing the changes to include/uapi/linux/netfilter (1 of 328 files). Show all
Unified · Split
| @@ -106,7 +106,7 @@ enum ip_conntrack_status { · 105 unmodified lines | |||
| 106 | IPS_NAT_CLASH = IPS_UNTRACKED, | 106 | IPS_NAT_CLASH = IPS_UNTRACKED, |
| 107 | #endif | 107 | #endif |
| 108 | 108 | ||
| 109 | /* Conntrack got a helper explicitly attached via CT target. */ | 109 | /* Conntrack got a helper explicitly attached (ruleset, ctnetlink). */ |
| 110 | IPS_HELPER_BIT = 13, | 110 | IPS_HELPER_BIT = 13, |
| 111 | IPS_HELPER = (1 << IPS_HELPER_BIT), | 111 | IPS_HELPER = (1 << IPS_HELPER_BIT), |
| 112 | 112 | ||