Commit 052059b6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'nf-next-2023-08-08' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next 

Florian Westphal says:

====================
netfilter updates for net-next

First 4 Patches, from Yue Haibing, remove unused prototypes in
various netfilter headers.

Last patch makes nfnetlink_log to always include a packet timestamp,
up to now it was only included if the skb had assigned previously.
From Maciej Żenczykowski.

* tag 'nf-next-2023-08-08' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
  netfilter: nfnetlink_log: always add a timestamp
  netfilter: h323: Remove unused function declarations
  netfilter: conntrack: Remove unused function declarations
  netfilter: helper: Remove unused function declarations
  netfilter: gre: Remove unused function declaration nf_ct_gre_keymap_flush()
====================

Link: https://lore.kernel.org/r/20230808124159.19046-1-fw@strlen.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 99ecd6d0 1d85594f

include/linux/netfilter/nf_conntrack_h323.h

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ struct nf_ct_h323_master { 
int get_h225_addr(struct nf_conn *ct, unsigned char *data,

		  TransportAddress *taddr, union nf_inet_addr *addr,

		  __be16 *port);

void nf_conntrack_h245_expect(struct nf_conn *new,

			      struct nf_conntrack_expect *this);

void nf_conntrack_q931_expect(struct nf_conn *new,

			      struct nf_conntrack_expect *this);



struct nfct_h323_nat_hooks {

	int (*set_h245_addr)(struct sk_buff *skb, unsigned int protoff,

include/linux/netfilter/nf_conntrack_proto_gre.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ struct nf_ct_gre_keymap { 
int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,

			 struct nf_conntrack_tuple *t);



void nf_ct_gre_keymap_flush(struct net *net);

/* delete keymap entries */

void nf_ct_gre_keymap_destroy(struct nf_conn *ct);

include/net/netfilter/nf_conntrack.h

+0 −4
Original line number Diff line number Diff line
@@ -190,10 +190,6 @@ static inline void nf_ct_put(struct nf_conn *ct) 
		nf_ct_destroy(&ct->ct_general);

}



/* Protocol module loading */

int nf_ct_l3proto_try_module_get(unsigned short l3proto);

void nf_ct_l3proto_module_put(unsigned short l3proto);



/* load module; enable/disable conntrack in this namespace */

int nf_ct_netns_get(struct net *net, u8 nfproto);

void nf_ct_netns_put(struct net *net, u8 nfproto);

include/net/netfilter/nf_conntrack_acct.h

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


void nf_conntrack_acct_pernet_init(struct net *net);



void nf_conntrack_acct_fini(void);



#endif /* _NF_CONNTRACK_ACCT_H */

include/net/netfilter/nf_conntrack_helper.h

+0 −3
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ static inline void *nfct_help_data(const struct nf_conn *ct) 
	return (void *)help->data;

}



void nf_conntrack_helper_pernet_init(struct net *net);



int nf_conntrack_helper_init(void);

void nf_conntrack_helper_fini(void);
@@ -182,5 +180,4 @@ void nf_nat_helper_unregister(struct nf_conntrack_nat_helper *nat); 
int nf_nat_helper_try_module_get(const char *name, u16 l3num,

				 u8 protonum);

void nf_nat_helper_put(struct nf_conntrack_helper *helper);

void nf_ct_set_auto_assign_helper_warned(struct net *net);

#endif /*_NF_CONNTRACK_HELPER_H*/