diff options
-rw-r--r-- | include/net/dst.h | 1 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 1 | ||||
-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 |
6 files changed, 0 insertions, 8 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index f96c4ba4dd32..65a60fab2f82 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -104,7 +104,6 @@ struct dst_ops | |||
104 | void (*link_failure)(struct sk_buff *); | 104 | void (*link_failure)(struct sk_buff *); |
105 | void (*update_pmtu)(struct dst_entry *dst, u32 mtu); | 105 | void (*update_pmtu)(struct dst_entry *dst, u32 mtu); |
106 | int (*local_out)(struct sk_buff *skb); | 106 | int (*local_out)(struct sk_buff *skb); |
107 | int entry_size; | ||
108 | 107 | ||
109 | atomic_t entries; | 108 | atomic_t entries; |
110 | struct kmem_cache *kmem_cachep; | 109 | struct kmem_cache *kmem_cachep; |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 821bd1cdec04..768df000523b 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -131,7 +131,6 @@ static struct dst_ops dn_dst_ops = { | |||
131 | .negative_advice = dn_dst_negative_advice, | 131 | .negative_advice = dn_dst_negative_advice, |
132 | .link_failure = dn_dst_link_failure, | 132 | .link_failure = dn_dst_link_failure, |
133 | .update_pmtu = dn_dst_update_pmtu, | 133 | .update_pmtu = dn_dst_update_pmtu, |
134 | .entry_size = sizeof(struct dn_route), | ||
135 | .entries = ATOMIC_INIT(0), | 134 | .entries = ATOMIC_INIT(0), |
136 | }; | 135 | }; |
137 | 136 | ||
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 0dc0c3826763..4e6959c29819 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -160,7 +160,6 @@ static struct dst_ops ipv4_dst_ops = { | |||
160 | .link_failure = ipv4_link_failure, | 160 | .link_failure = ipv4_link_failure, |
161 | .update_pmtu = ip_rt_update_pmtu, | 161 | .update_pmtu = ip_rt_update_pmtu, |
162 | .local_out = __ip_local_out, | 162 | .local_out = __ip_local_out, |
163 | .entry_size = sizeof(struct rtable), | ||
164 | .entries = ATOMIC_INIT(0), | 163 | .entries = ATOMIC_INIT(0), |
165 | }; | 164 | }; |
166 | 165 | ||
@@ -2701,7 +2700,6 @@ static struct dst_ops ipv4_dst_blackhole_ops = { | |||
2701 | .destroy = ipv4_dst_destroy, | 2700 | .destroy = ipv4_dst_destroy, |
2702 | .check = ipv4_dst_check, | 2701 | .check = ipv4_dst_check, |
2703 | .update_pmtu = ipv4_rt_blackhole_update_pmtu, | 2702 | .update_pmtu = ipv4_rt_blackhole_update_pmtu, |
2704 | .entry_size = sizeof(struct rtable), | ||
2705 | .entries = ATOMIC_INIT(0), | 2703 | .entries = ATOMIC_INIT(0), |
2706 | }; | 2704 | }; |
2707 | 2705 | ||
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index f9a775b7e796..84dbb5a03cc2 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
@@ -246,7 +246,6 @@ static struct dst_ops xfrm4_dst_ops = { | |||
246 | .ifdown = xfrm4_dst_ifdown, | 246 | .ifdown = xfrm4_dst_ifdown, |
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), | ||
250 | .entries = ATOMIC_INIT(0), | 249 | .entries = ATOMIC_INIT(0), |
251 | }; | 250 | }; |
252 | 251 | ||
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 4d40dc214b2d..9da1ece466a2 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -108,7 +108,6 @@ static struct dst_ops ip6_dst_ops_template = { | |||
108 | .link_failure = ip6_link_failure, | 108 | .link_failure = ip6_link_failure, |
109 | .update_pmtu = ip6_rt_update_pmtu, | 109 | .update_pmtu = ip6_rt_update_pmtu, |
110 | .local_out = __ip6_local_out, | 110 | .local_out = __ip6_local_out, |
111 | .entry_size = sizeof(struct rt6_info), | ||
112 | .entries = ATOMIC_INIT(0), | 111 | .entries = ATOMIC_INIT(0), |
113 | }; | 112 | }; |
114 | 113 | ||
@@ -122,7 +121,6 @@ static struct dst_ops ip6_dst_blackhole_ops = { | |||
122 | .destroy = ip6_dst_destroy, | 121 | .destroy = ip6_dst_destroy, |
123 | .check = ip6_dst_check, | 122 | .check = ip6_dst_check, |
124 | .update_pmtu = ip6_rt_blackhole_update_pmtu, | 123 | .update_pmtu = ip6_rt_blackhole_update_pmtu, |
125 | .entry_size = sizeof(struct rt6_info), | ||
126 | .entries = ATOMIC_INIT(0), | 124 | .entries = ATOMIC_INIT(0), |
127 | }; | 125 | }; |
128 | 126 | ||
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 604bc0a96c05..3b67ce7786ec 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -277,7 +277,6 @@ static struct dst_ops xfrm6_dst_ops = { | |||
277 | .ifdown = xfrm6_dst_ifdown, | 277 | .ifdown = xfrm6_dst_ifdown, |
278 | .local_out = __ip6_local_out, | 278 | .local_out = __ip6_local_out, |
279 | .gc_thresh = 1024, | 279 | .gc_thresh = 1024, |
280 | .entry_size = sizeof(struct xfrm_dst), | ||
281 | .entries = ATOMIC_INIT(0), | 280 | .entries = ATOMIC_INIT(0), |
282 | }; | 281 | }; |
283 | 282 | ||