diff options
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 4 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_core.c | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ipt_LOG.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 422ab68ee7fb..7a4ecddd597b 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c | |||
| @@ -1354,7 +1354,7 @@ static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size) | |||
| 1354 | get_order(sizeof(struct list_head) * size)); | 1354 | get_order(sizeof(struct list_head) * size)); |
| 1355 | } | 1355 | } |
| 1356 | 1356 | ||
| 1357 | void ip_conntrack_flush() | 1357 | void ip_conntrack_flush(void) |
| 1358 | { | 1358 | { |
| 1359 | /* This makes sure all current packets have passed through | 1359 | /* This makes sure all current packets have passed through |
| 1360 | netfilter framework. Roll on, two-stage module | 1360 | netfilter framework. Roll on, two-stage module |
| @@ -1408,7 +1408,7 @@ static struct list_head *alloc_hashtable(int size, int *vmalloced) | |||
| 1408 | return hash; | 1408 | return hash; |
| 1409 | } | 1409 | } |
| 1410 | 1410 | ||
| 1411 | int set_hashsize(const char *val, struct kernel_param *kp) | 1411 | static int set_hashsize(const char *val, struct kernel_param *kp) |
| 1412 | { | 1412 | { |
| 1413 | int i, bucket, hashsize, vmalloced; | 1413 | int i, bucket, hashsize, vmalloced; |
| 1414 | int old_vmalloced, old_size; | 1414 | int old_vmalloced, old_size; |
diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c index 762f4d93936b..c1a61462507f 100644 --- a/net/ipv4/netfilter/ip_nat_core.c +++ b/net/ipv4/netfilter/ip_nat_core.c | |||
| @@ -49,7 +49,7 @@ static unsigned int ip_nat_htable_size; | |||
| 49 | static struct list_head *bysource; | 49 | static struct list_head *bysource; |
| 50 | 50 | ||
| 51 | #define MAX_IP_NAT_PROTO 256 | 51 | #define MAX_IP_NAT_PROTO 256 |
| 52 | struct ip_nat_protocol *ip_nat_protos[MAX_IP_NAT_PROTO]; | 52 | static struct ip_nat_protocol *ip_nat_protos[MAX_IP_NAT_PROTO]; |
| 53 | 53 | ||
| 54 | static inline struct ip_nat_protocol * | 54 | static inline struct ip_nat_protocol * |
| 55 | __ip_nat_proto_find(u_int8_t protonum) | 55 | __ip_nat_proto_find(u_int8_t protonum) |
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c index 180d6ca04af6..30be0f1dae37 100644 --- a/net/ipv4/netfilter/ipt_LOG.c +++ b/net/ipv4/netfilter/ipt_LOG.c | |||
| @@ -351,7 +351,7 @@ static void dump_packet(const struct nf_loginfo *info, | |||
| 351 | /* maxlen = 230+ 91 + 230 + 252 = 803 */ | 351 | /* maxlen = 230+ 91 + 230 + 252 = 803 */ |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | struct nf_loginfo default_loginfo = { | 354 | static struct nf_loginfo default_loginfo = { |
| 355 | .type = NF_LOG_TYPE_LOG, | 355 | .type = NF_LOG_TYPE_LOG, |
| 356 | .u = { | 356 | .u = { |
| 357 | .log = { | 357 | .log = { |
