aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2006-09-20 15:03:46 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 18:19:58 -0400
commit1192e403e9ea2dc23bbbe2b4fe9bdbc47e8c6056 (patch)
tree5554ab529123500558637dc39cf14247e02a41cc
parentc1fe3ca5106d9568791433fa6c7f27e71ac69e1b (diff)
[NETFILTER]: make some netfilter globals __read_mostly
Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--net/ipv4/netfilter/ip_conntrack_core.c6
-rw-r--r--net/ipv4/netfilter/ip_queue.c8
-rw-r--r--net/ipv6/netfilter/ip6_queue.c8
-rw-r--r--net/netfilter/nf_conntrack_core.c10
4 files changed, 16 insertions, 16 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 422a662194c..2b6f24fc727 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -63,17 +63,17 @@ atomic_t ip_conntrack_count = ATOMIC_INIT(0);
63 63
64void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack) = NULL; 64void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack) = NULL;
65LIST_HEAD(ip_conntrack_expect_list); 65LIST_HEAD(ip_conntrack_expect_list);
66struct ip_conntrack_protocol *ip_ct_protos[MAX_IP_CT_PROTO]; 66struct ip_conntrack_protocol *ip_ct_protos[MAX_IP_CT_PROTO] __read_mostly;
67static LIST_HEAD(helpers); 67static LIST_HEAD(helpers);
68unsigned int ip_conntrack_htable_size __read_mostly = 0; 68unsigned int ip_conntrack_htable_size __read_mostly = 0;
69int ip_conntrack_max __read_mostly; 69int ip_conntrack_max __read_mostly;
70struct list_head *ip_conntrack_hash; 70struct list_head *ip_conntrack_hash __read_mostly;
71static kmem_cache_t *ip_conntrack_cachep __read_mostly; 71static kmem_cache_t *ip_conntrack_cachep __read_mostly;
72static kmem_cache_t *ip_conntrack_expect_cachep __read_mostly; 72static kmem_cache_t *ip_conntrack_expect_cachep __read_mostly;
73struct ip_conntrack ip_conntrack_untracked; 73struct ip_conntrack ip_conntrack_untracked;
74unsigned int ip_ct_log_invalid __read_mostly; 74unsigned int ip_ct_log_invalid __read_mostly;
75static LIST_HEAD(unconfirmed); 75static LIST_HEAD(unconfirmed);
76static int ip_conntrack_vmalloc; 76static int ip_conntrack_vmalloc __read_mostly;
77 77
78static unsigned int ip_conntrack_next_id; 78static unsigned int ip_conntrack_next_id;
79static unsigned int ip_conntrack_expect_next_id; 79static unsigned int ip_conntrack_expect_next_id;
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 80060cbe4a0..7edad790478 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -52,15 +52,15 @@ struct ipq_queue_entry {
52 52
53typedef int (*ipq_cmpfn)(struct ipq_queue_entry *, unsigned long); 53typedef int (*ipq_cmpfn)(struct ipq_queue_entry *, unsigned long);
54 54
55static unsigned char copy_mode = IPQ_COPY_NONE; 55static unsigned char copy_mode __read_mostly = IPQ_COPY_NONE;
56static unsigned int queue_maxlen __read_mostly = IPQ_QMAX_DEFAULT; 56static unsigned int queue_maxlen __read_mostly = IPQ_QMAX_DEFAULT;
57static DEFINE_RWLOCK(queue_lock); 57static DEFINE_RWLOCK(queue_lock);
58static int peer_pid; 58static int peer_pid __read_mostly;
59static unsigned int copy_range; 59static unsigned int copy_range __read_mostly;
60static unsigned int queue_total; 60static unsigned int queue_total;
61static unsigned int queue_dropped = 0; 61static unsigned int queue_dropped = 0;
62static unsigned int queue_user_dropped = 0; 62static unsigned int queue_user_dropped = 0;
63static struct sock *ipqnl; 63static struct sock *ipqnl __read_mostly;
64static LIST_HEAD(queue_list); 64static LIST_HEAD(queue_list);
65static DEFINE_MUTEX(ipqnl_mutex); 65static DEFINE_MUTEX(ipqnl_mutex);
66 66
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index d322e839579..9510c24ca8d 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -56,15 +56,15 @@ struct ipq_queue_entry {
56 56
57typedef int (*ipq_cmpfn)(struct ipq_queue_entry *, unsigned long); 57typedef int (*ipq_cmpfn)(struct ipq_queue_entry *, unsigned long);
58 58
59static unsigned char copy_mode = IPQ_COPY_NONE; 59static unsigned char copy_mode __read_mostly = IPQ_COPY_NONE;
60static unsigned int queue_maxlen __read_mostly = IPQ_QMAX_DEFAULT; 60static unsigned int queue_maxlen __read_mostly = IPQ_QMAX_DEFAULT;
61static DEFINE_RWLOCK(queue_lock); 61static DEFINE_RWLOCK(queue_lock);
62static int peer_pid; 62static int peer_pid __read_mostly;
63static unsigned int copy_range; 63static unsigned int copy_range __read_mostly;
64static unsigned int queue_total; 64static unsigned int queue_total;
65static unsigned int queue_dropped = 0; 65static unsigned int queue_dropped = 0;
66static unsigned int queue_user_dropped = 0; 66static unsigned int queue_user_dropped = 0;
67static struct sock *ipqnl; 67static struct sock *ipqnl __read_mostly;
68static LIST_HEAD(queue_list); 68static LIST_HEAD(queue_list);
69static DEFINE_MUTEX(ipqnl_mutex); 69static DEFINE_MUTEX(ipqnl_mutex);
70 70
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index adeafa2cc33..093b3ddc513 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -73,17 +73,17 @@ atomic_t nf_conntrack_count = ATOMIC_INIT(0);
73 73
74void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) = NULL; 74void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) = NULL;
75LIST_HEAD(nf_conntrack_expect_list); 75LIST_HEAD(nf_conntrack_expect_list);
76struct nf_conntrack_protocol **nf_ct_protos[PF_MAX]; 76struct nf_conntrack_protocol **nf_ct_protos[PF_MAX] __read_mostly;
77struct nf_conntrack_l3proto *nf_ct_l3protos[PF_MAX]; 77struct nf_conntrack_l3proto *nf_ct_l3protos[PF_MAX] __read_mostly;
78static LIST_HEAD(helpers); 78static LIST_HEAD(helpers);
79unsigned int nf_conntrack_htable_size __read_mostly = 0; 79unsigned int nf_conntrack_htable_size __read_mostly = 0;
80int nf_conntrack_max __read_mostly; 80int nf_conntrack_max __read_mostly;
81struct list_head *nf_conntrack_hash; 81struct list_head *nf_conntrack_hash __read_mostly;
82static kmem_cache_t *nf_conntrack_expect_cachep; 82static kmem_cache_t *nf_conntrack_expect_cachep __read_mostly;
83struct nf_conn nf_conntrack_untracked; 83struct nf_conn nf_conntrack_untracked;
84unsigned int nf_ct_log_invalid __read_mostly; 84unsigned int nf_ct_log_invalid __read_mostly;
85static LIST_HEAD(unconfirmed); 85static LIST_HEAD(unconfirmed);
86static int nf_conntrack_vmalloc; 86static int nf_conntrack_vmalloc __read_mostly;
87 87
88static unsigned int nf_conntrack_next_id; 88static unsigned int nf_conntrack_next_id;
89static unsigned int nf_conntrack_expect_next_id; 89static unsigned int nf_conntrack_expect_next_id;
generated by cgit v1.2.2 (git 2.25.0) at 2026-03-10 21:47:35 -0400