Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: nf_ct_sctp: move ip_ct_sctp away from UAPI

ip_ct_sctp is an internal structure, embedded by the union
nf_conntrack_proto to store sctp-specific information at conntrack
entries. It has no business with UAPI.

This patch moves it from UAPI to a saner place, together with similar
structs for other protocols.

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Marcelo Ricardo Leitner and committed by
Pablo Neira Ayuso
f7ccdb96 c1bc1d25

+16 -9
+13
include/linux/netfilter/nf_conntrack_sctp.h
··· 1 + #ifndef _NF_CONNTRACK_SCTP_H 2 + #define _NF_CONNTRACK_SCTP_H 3 + /* SCTP tracking. */ 4 + 5 + #include <uapi/linux/netfilter/nf_conntrack_sctp.h> 6 + 7 + struct ip_ct_sctp { 8 + enum sctp_conntrack state; 9 + 10 + __be32 vtag[IP_CT_DIR_MAX]; 11 + }; 12 + 13 + #endif /* _NF_CONNTRACK_SCTP_H */
+3 -9
include/uapi/linux/netfilter/nf_conntrack_sctp.h
··· 1 - #ifndef _NF_CONNTRACK_SCTP_H 2 - #define _NF_CONNTRACK_SCTP_H 1 + #ifndef _UAPI_NF_CONNTRACK_SCTP_H 2 + #define _UAPI_NF_CONNTRACK_SCTP_H 3 3 /* SCTP tracking. */ 4 4 5 5 #include <linux/netfilter/nf_conntrack_tuple_common.h> ··· 18 18 SCTP_CONNTRACK_MAX 19 19 }; 20 20 21 - struct ip_ct_sctp { 22 - enum sctp_conntrack state; 23 - 24 - __be32 vtag[IP_CT_DIR_MAX]; 25 - }; 26 - 27 - #endif /* _NF_CONNTRACK_SCTP_H */ 21 + #endif /* _UAPI_NF_CONNTRACK_SCTP_H */