diff options
Diffstat (limited to 'net/core/flow.c')
-rw-r--r-- | net/core/flow.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index 43f7495df27a..c56ea6f7f6c7 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -132,14 +132,14 @@ static void __flow_cache_shrink(struct flow_cache *fc, | |||
132 | int shrink_to) | 132 | int shrink_to) |
133 | { | 133 | { |
134 | struct flow_cache_entry *fle; | 134 | struct flow_cache_entry *fle; |
135 | struct hlist_node *entry, *tmp; | 135 | struct hlist_node *tmp; |
136 | LIST_HEAD(gc_list); | 136 | LIST_HEAD(gc_list); |
137 | int i, deleted = 0; | 137 | int i, deleted = 0; |
138 | 138 | ||
139 | for (i = 0; i < flow_cache_hash_size(fc); i++) { | 139 | for (i = 0; i < flow_cache_hash_size(fc); i++) { |
140 | int saved = 0; | 140 | int saved = 0; |
141 | 141 | ||
142 | hlist_for_each_entry_safe(fle, entry, tmp, | 142 | hlist_for_each_entry_safe(fle, tmp, |
143 | &fcp->hash_table[i], u.hlist) { | 143 | &fcp->hash_table[i], u.hlist) { |
144 | if (saved < shrink_to && | 144 | if (saved < shrink_to && |
145 | flow_entry_valid(fle)) { | 145 | flow_entry_valid(fle)) { |
@@ -211,7 +211,6 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, | |||
211 | struct flow_cache *fc = &flow_cache_global; | 211 | struct flow_cache *fc = &flow_cache_global; |
212 | struct flow_cache_percpu *fcp; | 212 | struct flow_cache_percpu *fcp; |
213 | struct flow_cache_entry *fle, *tfle; | 213 | struct flow_cache_entry *fle, *tfle; |
214 | struct hlist_node *entry; | ||
215 | struct flow_cache_object *flo; | 214 | struct flow_cache_object *flo; |
216 | size_t keysize; | 215 | size_t keysize; |
217 | unsigned int hash; | 216 | unsigned int hash; |
@@ -235,7 +234,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, | |||
235 | flow_new_hash_rnd(fc, fcp); | 234 | flow_new_hash_rnd(fc, fcp); |
236 | 235 | ||
237 | hash = flow_hash_code(fc, fcp, key, keysize); | 236 | hash = flow_hash_code(fc, fcp, key, keysize); |
238 | hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) { | 237 | hlist_for_each_entry(tfle, &fcp->hash_table[hash], u.hlist) { |
239 | if (tfle->net == net && | 238 | if (tfle->net == net && |
240 | tfle->family == family && | 239 | tfle->family == family && |
241 | tfle->dir == dir && | 240 | tfle->dir == dir && |
@@ -301,13 +300,13 @@ static void flow_cache_flush_tasklet(unsigned long data) | |||
301 | struct flow_cache *fc = info->cache; | 300 | struct flow_cache *fc = info->cache; |
302 | struct flow_cache_percpu *fcp; | 301 | struct flow_cache_percpu *fcp; |
303 | struct flow_cache_entry *fle; | 302 | struct flow_cache_entry *fle; |
304 | struct hlist_node *entry, *tmp; | 303 | struct hlist_node *tmp; |
305 | LIST_HEAD(gc_list); | 304 | LIST_HEAD(gc_list); |
306 | int i, deleted = 0; | 305 | int i, deleted = 0; |
307 | 306 | ||
308 | fcp = this_cpu_ptr(fc->percpu); | 307 | fcp = this_cpu_ptr(fc->percpu); |
309 | for (i = 0; i < flow_cache_hash_size(fc); i++) { | 308 | for (i = 0; i < flow_cache_hash_size(fc); i++) { |
310 | hlist_for_each_entry_safe(fle, entry, tmp, | 309 | hlist_for_each_entry_safe(fle, tmp, |
311 | &fcp->hash_table[i], u.hlist) { | 310 | &fcp->hash_table[i], u.hlist) { |
312 | if (flow_entry_valid(fle)) | 311 | if (flow_entry_valid(fle)) |
313 | continue; | 312 | continue; |