Commit 1015c3de authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove extension register api 



These no longer register/unregister a meaningful structure so remove it.

Cc: Paul Blakey <paulb@nvidia.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1bc91a5d

include/net/netfilter/nf_conntrack_acct.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static inline void nf_ct_acct_update(struct nf_conn *ct, u32 dir, 


void nf_conntrack_acct_pernet_init(struct net *net);



int nf_conntrack_acct_init(void);

void nf_conntrack_acct_fini(void);



#endif /* _NF_CONNTRACK_ACCT_H */

include/net/netfilter/nf_conntrack_ecache.h

+0 −13
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state); 
void nf_conntrack_ecache_pernet_init(struct net *net);

void nf_conntrack_ecache_pernet_fini(struct net *net);



int nf_conntrack_ecache_init(void);

void nf_conntrack_ecache_fini(void);



static inline bool nf_conntrack_ecache_dwork_pending(const struct net *net)

{

	return net->ct.ecache_dwork_pending;
@@ -194,16 +191,6 @@ static inline void nf_conntrack_ecache_pernet_init(struct net *net) 
static inline void nf_conntrack_ecache_pernet_fini(struct net *net)

{

}



static inline int nf_conntrack_ecache_init(void)

{

	return 0;

}



static inline void nf_conntrack_ecache_fini(void)

{

}



static inline bool nf_conntrack_ecache_dwork_pending(const struct net *net) { return false; }

#endif /* CONFIG_NF_CONNTRACK_EVENTS */

#endif /*_NF_CONNTRACK_ECACHE_H*/

include/net/netfilter/nf_conntrack_extend.h

+0 −9
Original line number Diff line number Diff line
@@ -72,16 +72,7 @@ static inline void *__nf_ct_ext_find(const struct nf_conn *ct, u8 id) 
#define nf_ct_ext_find(ext, id)	\

	((id##_TYPE *)__nf_ct_ext_find((ext), (id)))



/* Destroy all relationships */

void nf_ct_ext_destroy(struct nf_conn *ct);



/* Add this type, returns pointer to data or NULL. */

void *nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);



struct nf_ct_ext_type {

	enum nf_ct_ext_id id;

};



int nf_ct_extend_register(const struct nf_ct_ext_type *type);

void nf_ct_extend_unregister(const struct nf_ct_ext_type *type);

#endif /* _NF_CONNTRACK_EXTEND_H */

include/net/netfilter/nf_conntrack_labels.h

+0 −3
Original line number Diff line number Diff line
@@ -45,12 +45,9 @@ int nf_connlabels_replace(struct nf_conn *ct, 


#ifdef CONFIG_NF_CONNTRACK_LABELS

int nf_conntrack_labels_init(void);

void nf_conntrack_labels_fini(void);

int nf_connlabels_get(struct net *net, unsigned int bit);

void nf_connlabels_put(struct net *net);

#else

static inline int nf_conntrack_labels_init(void) { return 0; }

static inline void nf_conntrack_labels_fini(void) {}

static inline int nf_connlabels_get(struct net *net, unsigned int bit) { return 0; }

static inline void nf_connlabels_put(struct net *net) {}

#endif

include/net/netfilter/nf_conntrack_seqadj.h

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,4 @@ int nf_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct, 
		     enum ip_conntrack_info ctinfo, unsigned int protoff);

s32 nf_ct_seq_offset(const struct nf_conn *ct, enum ip_conntrack_dir, u32 seq);



int nf_conntrack_seqadj_init(void);

void nf_conntrack_seqadj_fini(void);



#endif /* _NF_CONNTRACK_SEQADJ_H */