Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c200d93 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Patrick McHardy
Browse files

netfilter: nf_nat: make find/put static 



The functions nf_nat_proto_find_get and nf_nat_proto_put are
only used internally in nf_nat_core. This might break some out
of tree NAT module.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 758ff033

include/net/netfilter/nf_nat_protocol.h

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ struct nf_nat_protocol { 
extern int nf_nat_protocol_register(const struct nf_nat_protocol *proto);

extern void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto);



extern const struct nf_nat_protocol *nf_nat_proto_find_get(u_int8_t protocol);

extern void nf_nat_proto_put(const struct nf_nat_protocol *proto);



/* Built-in protocols. */

extern const struct nf_nat_protocol nf_nat_protocol_tcp;

extern const struct nf_nat_protocol nf_nat_protocol_udp;

net/ipv4/netfilter/nf_nat_core.c

+2 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ __nf_nat_proto_find(u_int8_t protonum) 
	return rcu_dereference(nf_nat_protos[protonum]);

}



const struct nf_nat_protocol *

static const struct nf_nat_protocol *

nf_nat_proto_find_get(u_int8_t protonum)

{

	const struct nf_nat_protocol *p;
@@ -60,14 +60,12 @@ nf_nat_proto_find_get(u_int8_t protonum) 


	return p;

}

EXPORT_SYMBOL_GPL(nf_nat_proto_find_get);



void

static void

nf_nat_proto_put(const struct nf_nat_protocol *p)

{

	module_put(p->me);

}

EXPORT_SYMBOL_GPL(nf_nat_proto_put);



/* We keep an extra hash for each conntrack, for fast searching. */

static inline unsigned int