diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-01-31 07:00:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:27:34 -0500 |
commit | 30083c9500b8aa3bc48579eaadb5068ad057afbd (patch) | |
tree | a2f234b0bd28dd7eeee9c5362e84b92e06d90a75 /net/bridge | |
parent | f776c4cda449bab463f5388eb07bd63dc52e2b13 (diff) |
[NETFILTER]: ebtables: mark matches, targets and watchers __read_mostly
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_802_3.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_among.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_arp.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_arpreply.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_dnat.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ip.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_limit.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_mark.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_mark_m.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_pkttype.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_redirect.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_snat.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_stp.c | 3 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_vlan.c | 2 |
15 files changed, 15 insertions, 27 deletions
diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c index ef73592f7ede..98534025360f 100644 --- a/net/bridge/netfilter/ebt_802_3.c +++ b/net/bridge/netfilter/ebt_802_3.c | |||
@@ -50,8 +50,7 @@ static int ebt_802_3_check(const char *tablename, unsigned int hookmask, | |||
50 | return 0; | 50 | return 0; |
51 | } | 51 | } |
52 | 52 | ||
53 | static struct ebt_match filter_802_3 = | 53 | static struct ebt_match filter_802_3 __read_mostly = { |
54 | { | ||
55 | .name = EBT_802_3_MATCH, | 54 | .name = EBT_802_3_MATCH, |
56 | .match = ebt_filter_802_3, | 55 | .match = ebt_filter_802_3, |
57 | .check = ebt_802_3_check, | 56 | .check = ebt_802_3_check, |
diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c index bf0d1d98ad55..70b6dca5ea75 100644 --- a/net/bridge/netfilter/ebt_among.c +++ b/net/bridge/netfilter/ebt_among.c | |||
@@ -212,7 +212,7 @@ static int ebt_among_check(const char *tablename, unsigned int hookmask, | |||
212 | return 0; | 212 | return 0; |
213 | } | 213 | } |
214 | 214 | ||
215 | static struct ebt_match filter_among = { | 215 | static struct ebt_match filter_among __read_mostly = { |
216 | .name = EBT_AMONG_MATCH, | 216 | .name = EBT_AMONG_MATCH, |
217 | .match = ebt_filter_among, | 217 | .match = ebt_filter_among, |
218 | .check = ebt_among_check, | 218 | .check = ebt_among_check, |
diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c index 8d6ab644e7bf..7c535be75665 100644 --- a/net/bridge/netfilter/ebt_arp.c +++ b/net/bridge/netfilter/ebt_arp.c | |||
@@ -116,8 +116,7 @@ static int ebt_arp_check(const char *tablename, unsigned int hookmask, | |||
116 | return 0; | 116 | return 0; |
117 | } | 117 | } |
118 | 118 | ||
119 | static struct ebt_match filter_arp = | 119 | static struct ebt_match filter_arp __read_mostly = { |
120 | { | ||
121 | .name = EBT_ARP_MATCH, | 120 | .name = EBT_ARP_MATCH, |
122 | .match = ebt_filter_arp, | 121 | .match = ebt_filter_arp, |
123 | .check = ebt_arp_check, | 122 | .check = ebt_arp_check, |
diff --git a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c index 9f2542356f58..0c4279590fc7 100644 --- a/net/bridge/netfilter/ebt_arpreply.c +++ b/net/bridge/netfilter/ebt_arpreply.c | |||
@@ -76,8 +76,7 @@ static int ebt_target_reply_check(const char *tablename, unsigned int hookmask, | |||
76 | return 0; | 76 | return 0; |
77 | } | 77 | } |
78 | 78 | ||
79 | static struct ebt_target reply_target = | 79 | static struct ebt_target reply_target __read_mostly = { |
80 | { | ||
81 | .name = EBT_ARPREPLY_TARGET, | 80 | .name = EBT_ARPREPLY_TARGET, |
82 | .target = ebt_target_reply, | 81 | .target = ebt_target_reply, |
83 | .check = ebt_target_reply_check, | 82 | .check = ebt_target_reply_check, |
diff --git a/net/bridge/netfilter/ebt_dnat.c b/net/bridge/netfilter/ebt_dnat.c index 285378d70e58..e700cbf634c2 100644 --- a/net/bridge/netfilter/ebt_dnat.c +++ b/net/bridge/netfilter/ebt_dnat.c | |||
@@ -46,8 +46,7 @@ static int ebt_target_dnat_check(const char *tablename, unsigned int hookmask, | |||
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | static struct ebt_target dnat = | 49 | static struct ebt_target dnat __read_mostly = { |
50 | { | ||
51 | .name = EBT_DNAT_TARGET, | 50 | .name = EBT_DNAT_TARGET, |
52 | .target = ebt_target_dnat, | 51 | .target = ebt_target_dnat, |
53 | .check = ebt_target_dnat_check, | 52 | .check = ebt_target_dnat_check, |
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c index 78efe9b149bd..65caa00dcf2a 100644 --- a/net/bridge/netfilter/ebt_ip.c +++ b/net/bridge/netfilter/ebt_ip.c | |||
@@ -107,8 +107,7 @@ static int ebt_ip_check(const char *tablename, unsigned int hookmask, | |||
107 | return 0; | 107 | return 0; |
108 | } | 108 | } |
109 | 109 | ||
110 | static struct ebt_match filter_ip = | 110 | static struct ebt_match filter_ip __read_mostly = { |
111 | { | ||
112 | .name = EBT_IP_MATCH, | 111 | .name = EBT_IP_MATCH, |
113 | .match = ebt_filter_ip, | 112 | .match = ebt_filter_ip, |
114 | .check = ebt_ip_check, | 113 | .check = ebt_ip_check, |
diff --git a/net/bridge/netfilter/ebt_limit.c b/net/bridge/netfilter/ebt_limit.c index 3c44bd6c8f37..8cbdc01c253e 100644 --- a/net/bridge/netfilter/ebt_limit.c +++ b/net/bridge/netfilter/ebt_limit.c | |||
@@ -90,8 +90,7 @@ static int ebt_limit_check(const char *tablename, unsigned int hookmask, | |||
90 | return 0; | 90 | return 0; |
91 | } | 91 | } |
92 | 92 | ||
93 | static struct ebt_match ebt_limit_reg = | 93 | static struct ebt_match ebt_limit_reg __read_mostly = { |
94 | { | ||
95 | .name = EBT_LIMIT_MATCH, | 94 | .name = EBT_LIMIT_MATCH, |
96 | .match = ebt_limit_match, | 95 | .match = ebt_limit_match, |
97 | .check = ebt_limit_check, | 96 | .check = ebt_limit_check, |
diff --git a/net/bridge/netfilter/ebt_mark.c b/net/bridge/netfilter/ebt_mark.c index 93ea76373f31..36723f47db0a 100644 --- a/net/bridge/netfilter/ebt_mark.c +++ b/net/bridge/netfilter/ebt_mark.c | |||
@@ -57,8 +57,7 @@ static int ebt_target_mark_check(const char *tablename, unsigned int hookmask, | |||
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
59 | 59 | ||
60 | static struct ebt_target mark_target = | 60 | static struct ebt_target mark_target __read_mostly = { |
61 | { | ||
62 | .name = EBT_MARK_TARGET, | 61 | .name = EBT_MARK_TARGET, |
63 | .target = ebt_target_mark, | 62 | .target = ebt_target_mark, |
64 | .check = ebt_target_mark_check, | 63 | .check = ebt_target_mark_check, |
diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c index 914c2443e1cd..9b0a4543861f 100644 --- a/net/bridge/netfilter/ebt_mark_m.c +++ b/net/bridge/netfilter/ebt_mark_m.c | |||
@@ -39,8 +39,7 @@ static int ebt_mark_check(const char *tablename, unsigned int hookmask, | |||
39 | return 0; | 39 | return 0; |
40 | } | 40 | } |
41 | 41 | ||
42 | static struct ebt_match filter_mark = | 42 | static struct ebt_match filter_mark __read_mostly = { |
43 | { | ||
44 | .name = EBT_MARK_MATCH, | 43 | .name = EBT_MARK_MATCH, |
45 | .match = ebt_filter_mark, | 44 | .match = ebt_filter_mark, |
46 | .check = ebt_mark_check, | 45 | .check = ebt_mark_check, |
diff --git a/net/bridge/netfilter/ebt_pkttype.c b/net/bridge/netfilter/ebt_pkttype.c index 19a69ea8ba62..676db32df3d1 100644 --- a/net/bridge/netfilter/ebt_pkttype.c +++ b/net/bridge/netfilter/ebt_pkttype.c | |||
@@ -36,8 +36,7 @@ static int ebt_pkttype_check(const char *tablename, unsigned int hookmask, | |||
36 | return 0; | 36 | return 0; |
37 | } | 37 | } |
38 | 38 | ||
39 | static struct ebt_match filter_pkttype = | 39 | static struct ebt_match filter_pkttype __read_mostly = { |
40 | { | ||
41 | .name = EBT_PKTTYPE_MATCH, | 40 | .name = EBT_PKTTYPE_MATCH, |
42 | .match = ebt_filter_pkttype, | 41 | .match = ebt_filter_pkttype, |
43 | .check = ebt_pkttype_check, | 42 | .check = ebt_pkttype_check, |
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c index f206a27d40b9..bfdf2fb60b1f 100644 --- a/net/bridge/netfilter/ebt_redirect.c +++ b/net/bridge/netfilter/ebt_redirect.c | |||
@@ -51,8 +51,7 @@ static int ebt_target_redirect_check(const char *tablename, unsigned int hookmas | |||
51 | return 0; | 51 | return 0; |
52 | } | 52 | } |
53 | 53 | ||
54 | static struct ebt_target redirect_target = | 54 | static struct ebt_target redirect_target __read_mostly = { |
55 | { | ||
56 | .name = EBT_REDIRECT_TARGET, | 55 | .name = EBT_REDIRECT_TARGET, |
57 | .target = ebt_target_redirect, | 56 | .target = ebt_target_redirect, |
58 | .check = ebt_target_redirect_check, | 57 | .check = ebt_target_redirect_check, |
diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c index ed858580b07e..e252dabbb143 100644 --- a/net/bridge/netfilter/ebt_snat.c +++ b/net/bridge/netfilter/ebt_snat.c | |||
@@ -68,8 +68,7 @@ static int ebt_target_snat_check(const char *tablename, unsigned int hookmask, | |||
68 | return 0; | 68 | return 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | static struct ebt_target snat = | 71 | static struct ebt_target snat __read_mostly = { |
72 | { | ||
73 | .name = EBT_SNAT_TARGET, | 72 | .name = EBT_SNAT_TARGET, |
74 | .target = ebt_target_snat, | 73 | .target = ebt_target_snat, |
75 | .check = ebt_target_snat_check, | 74 | .check = ebt_target_snat_check, |
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c index c2647977a763..40f36d37607d 100644 --- a/net/bridge/netfilter/ebt_stp.c +++ b/net/bridge/netfilter/ebt_stp.c | |||
@@ -174,8 +174,7 @@ static int ebt_stp_check(const char *tablename, unsigned int hookmask, | |||
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
176 | 176 | ||
177 | static struct ebt_match filter_stp = | 177 | static struct ebt_match filter_stp __read_mostly = { |
178 | { | ||
179 | .name = EBT_STP_MATCH, | 178 | .name = EBT_STP_MATCH, |
180 | .match = ebt_filter_stp, | 179 | .match = ebt_filter_stp, |
181 | .check = ebt_stp_check, | 180 | .check = ebt_stp_check, |
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 748eecda800e..2d4c9ef909fc 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
@@ -272,7 +272,7 @@ static int ebt_ulog_check(const char *tablename, unsigned int hookmask, | |||
272 | return 0; | 272 | return 0; |
273 | } | 273 | } |
274 | 274 | ||
275 | static struct ebt_watcher ulog = { | 275 | static struct ebt_watcher ulog __read_mostly = { |
276 | .name = EBT_ULOG_WATCHER, | 276 | .name = EBT_ULOG_WATCHER, |
277 | .watcher = ebt_ulog, | 277 | .watcher = ebt_ulog, |
278 | .check = ebt_ulog_check, | 278 | .check = ebt_ulog_check, |
diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c index 96897e28dd85..ab60b0dade80 100644 --- a/net/bridge/netfilter/ebt_vlan.c +++ b/net/bridge/netfilter/ebt_vlan.c | |||
@@ -169,7 +169,7 @@ ebt_check_vlan(const char *tablename, | |||
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |
171 | 171 | ||
172 | static struct ebt_match filter_vlan = { | 172 | static struct ebt_match filter_vlan __read_mostly = { |
173 | .name = EBT_VLAN_MATCH, | 173 | .name = EBT_VLAN_MATCH, |
174 | .match = ebt_filter_vlan, | 174 | .match = ebt_filter_vlan, |
175 | .check = ebt_check_vlan, | 175 | .check = ebt_check_vlan, |