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

Commit d127e94a authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[NETFILTER] ipv4: small cleanups 



This patch contains the following cleanups:
- make needlessly global code static
- ip_conntrack_core.c: ip_conntrack_flush() -> ip_conntrack_flush(void)

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b30b1c6

net/ipv4/netfilter/ip_conntrack_core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1354,7 +1354,7 @@ static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size) 
			   get_order(sizeof(struct list_head) * size));

			   get_order(sizeof(struct list_head) * size));

}

}





void ip_conntrack_flush()

void ip_conntrack_flush(void)

{

{

	/* This makes sure all current packets have passed through

	/* This makes sure all current packets have passed through

           netfilter framework.  Roll on, two-stage module

           netfilter framework.  Roll on, two-stage module
@@ -1408,7 +1408,7 @@ static struct list_head *alloc_hashtable(int size, int *vmalloced) 
	return hash;

	return hash;

}

}





int set_hashsize(const char *val, struct kernel_param *kp)

static int set_hashsize(const char *val, struct kernel_param *kp)

{

{

	int i, bucket, hashsize, vmalloced;

	int i, bucket, hashsize, vmalloced;

	int old_vmalloced, old_size;

	int old_vmalloced, old_size;

net/ipv4/netfilter/ip_nat_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ static unsigned int ip_nat_htable_size; 
static struct list_head *bysource;

static struct list_head *bysource;





#define MAX_IP_NAT_PROTO 256

#define MAX_IP_NAT_PROTO 256

struct ip_nat_protocol *ip_nat_protos[MAX_IP_NAT_PROTO];

static struct ip_nat_protocol *ip_nat_protos[MAX_IP_NAT_PROTO];





static inline struct ip_nat_protocol *

static inline struct ip_nat_protocol *

__ip_nat_proto_find(u_int8_t protonum)

__ip_nat_proto_find(u_int8_t protonum)

net/ipv4/netfilter/ipt_LOG.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -351,7 +351,7 @@ static void dump_packet(const struct nf_loginfo *info, 
	/* maxlen = 230+   91  + 230 + 252 = 803 */

	/* maxlen = 230+   91  + 230 + 252 = 803 */

}

}





struct nf_loginfo default_loginfo = {

static struct nf_loginfo default_loginfo = {

	.type	= NF_LOG_TYPE_LOG,

	.type	= NF_LOG_TYPE_LOG,

	.u = {

	.u = {

		.log = {

		.log = {