diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2008-01-30 23:07:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:27:23 -0500 |
commit | e242297055f906e8e225fb95a8edbc88e9052634 (patch) | |
tree | d0fb2d3ba0273bd621681b8de7621ee9b73baf44 /net | |
parent | ad1984e844fb6edaa8b9984be23669f4e19168be (diff) |
[NET]: should explicitely initialize atomic_t field in struct dst_ops
All but one struct dst_ops static initializations miss explicit
initialization of entries field.
As this field is atomic_t, we should use ATOMIC_INIT(0), and not
rely on atomic_t implementation.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/route.c | 2 | ||||
-rw-r--r-- | net/ipv4/xfrm4_policy.c | 1 | ||||
-rw-r--r-- | net/ipv6/route.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_policy.c | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 896c768e41a..163086b2f05 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -169,6 +169,7 @@ static struct dst_ops ipv4_dst_ops = { | |||
169 | .update_pmtu = ip_rt_update_pmtu, | 169 | .update_pmtu = ip_rt_update_pmtu, |
170 | .local_out = ip_local_out, | 170 | .local_out = ip_local_out, |
171 | .entry_size = sizeof(struct rtable), | 171 | .entry_size = sizeof(struct rtable), |
172 | .entries = ATOMIC_INIT(0), | ||
172 | }; | 173 | }; |
173 | 174 | ||
174 | #define ECN_OR_COST(class) TC_PRIO_##class | 175 | #define ECN_OR_COST(class) TC_PRIO_##class |
@@ -2498,6 +2499,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = { | |||
2498 | .check = ipv4_dst_check, | 2499 | .check = ipv4_dst_check, |
2499 | .update_pmtu = ipv4_rt_blackhole_update_pmtu, | 2500 | .update_pmtu = ipv4_rt_blackhole_update_pmtu, |
2500 | .entry_size = sizeof(struct rtable), | 2501 | .entry_size = sizeof(struct rtable), |
2502 | .entries = ATOMIC_INIT(0), | ||
2501 | }; | 2503 | }; |
2502 | 2504 | ||
2503 | 2505 | ||
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 3783e3ee56a..10ed7049143 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
@@ -247,6 +247,7 @@ static struct dst_ops xfrm4_dst_ops = { | |||
247 | .local_out = __ip_local_out, | 247 | .local_out = __ip_local_out, |
248 | .gc_thresh = 1024, | 248 | .gc_thresh = 1024, |
249 | .entry_size = sizeof(struct xfrm_dst), | 249 | .entry_size = sizeof(struct xfrm_dst), |
250 | .entries = ATOMIC_INIT(0), | ||
250 | }; | 251 | }; |
251 | 252 | ||
252 | static struct xfrm_policy_afinfo xfrm4_policy_afinfo = { | 253 | static struct xfrm_policy_afinfo xfrm4_policy_afinfo = { |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 162cb66d460..bf6b6652ab7 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -107,6 +107,7 @@ static struct dst_ops ip6_dst_ops = { | |||
107 | .update_pmtu = ip6_rt_update_pmtu, | 107 | .update_pmtu = ip6_rt_update_pmtu, |
108 | .local_out = ip6_local_out, | 108 | .local_out = ip6_local_out, |
109 | .entry_size = sizeof(struct rt6_info), | 109 | .entry_size = sizeof(struct rt6_info), |
110 | .entries = ATOMIC_INIT(0), | ||
110 | }; | 111 | }; |
111 | 112 | ||
112 | static void ip6_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu) | 113 | static void ip6_rt_blackhole_update_pmtu(struct dst_entry *dst, u32 mtu) |
@@ -120,6 +121,7 @@ static struct dst_ops ip6_dst_blackhole_ops = { | |||
120 | .check = ip6_dst_check, | 121 | .check = ip6_dst_check, |
121 | .update_pmtu = ip6_rt_blackhole_update_pmtu, | 122 | .update_pmtu = ip6_rt_blackhole_update_pmtu, |
122 | .entry_size = sizeof(struct rt6_info), | 123 | .entry_size = sizeof(struct rt6_info), |
124 | .entries = ATOMIC_INIT(0), | ||
123 | }; | 125 | }; |
124 | 126 | ||
125 | struct rt6_info ip6_null_entry = { | 127 | struct rt6_info ip6_null_entry = { |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index c25a6b527fc..7d20199ee1f 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -272,6 +272,7 @@ static struct dst_ops xfrm6_dst_ops = { | |||
272 | .local_out = __ip6_local_out, | 272 | .local_out = __ip6_local_out, |
273 | .gc_thresh = 1024, | 273 | .gc_thresh = 1024, |
274 | .entry_size = sizeof(struct xfrm_dst), | 274 | .entry_size = sizeof(struct xfrm_dst), |
275 | .entries = ATOMIC_INIT(0), | ||
275 | }; | 276 | }; |
276 | 277 | ||
277 | static struct xfrm_policy_afinfo xfrm6_policy_afinfo = { | 278 | static struct xfrm_policy_afinfo xfrm6_policy_afinfo = { |