diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/gen_estimator.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c index 9fbe7f7429b0..6743146e4d6b 100644 --- a/net/core/gen_estimator.c +++ b/net/core/gen_estimator.c | |||
| @@ -232,7 +232,7 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats, | |||
| 232 | est->last_packets = bstats->packets; | 232 | est->last_packets = bstats->packets; |
| 233 | est->avpps = rate_est->pps<<10; | 233 | est->avpps = rate_est->pps<<10; |
| 234 | 234 | ||
| 235 | spin_lock(&est_tree_lock); | 235 | spin_lock_bh(&est_tree_lock); |
| 236 | if (!elist[idx].timer.function) { | 236 | if (!elist[idx].timer.function) { |
| 237 | INIT_LIST_HEAD(&elist[idx].list); | 237 | INIT_LIST_HEAD(&elist[idx].list); |
| 238 | setup_timer(&elist[idx].timer, est_timer, idx); | 238 | setup_timer(&elist[idx].timer, est_timer, idx); |
| @@ -243,7 +243,7 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats, | |||
| 243 | 243 | ||
| 244 | list_add_rcu(&est->list, &elist[idx].list); | 244 | list_add_rcu(&est->list, &elist[idx].list); |
| 245 | gen_add_node(est); | 245 | gen_add_node(est); |
| 246 | spin_unlock(&est_tree_lock); | 246 | spin_unlock_bh(&est_tree_lock); |
| 247 | 247 | ||
| 248 | return 0; | 248 | return 0; |
| 249 | } | 249 | } |
| @@ -270,7 +270,7 @@ void gen_kill_estimator(struct gnet_stats_basic_packed *bstats, | |||
| 270 | { | 270 | { |
| 271 | struct gen_estimator *e; | 271 | struct gen_estimator *e; |
| 272 | 272 | ||
| 273 | spin_lock(&est_tree_lock); | 273 | spin_lock_bh(&est_tree_lock); |
| 274 | while ((e = gen_find_node(bstats, rate_est))) { | 274 | while ((e = gen_find_node(bstats, rate_est))) { |
| 275 | rb_erase(&e->node, &est_root); | 275 | rb_erase(&e->node, &est_root); |
| 276 | 276 | ||
| @@ -281,7 +281,7 @@ void gen_kill_estimator(struct gnet_stats_basic_packed *bstats, | |||
| 281 | list_del_rcu(&e->list); | 281 | list_del_rcu(&e->list); |
| 282 | call_rcu(&e->e_rcu, __gen_kill_estimator); | 282 | call_rcu(&e->e_rcu, __gen_kill_estimator); |
| 283 | } | 283 | } |
| 284 | spin_unlock(&est_tree_lock); | 284 | spin_unlock_bh(&est_tree_lock); |
| 285 | } | 285 | } |
| 286 | EXPORT_SYMBOL(gen_kill_estimator); | 286 | EXPORT_SYMBOL(gen_kill_estimator); |
| 287 | 287 | ||
| @@ -320,9 +320,9 @@ bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats, | |||
| 320 | 320 | ||
| 321 | ASSERT_RTNL(); | 321 | ASSERT_RTNL(); |
| 322 | 322 | ||
| 323 | spin_lock(&est_tree_lock); | 323 | spin_lock_bh(&est_tree_lock); |
| 324 | res = gen_find_node(bstats, rate_est) != NULL; | 324 | res = gen_find_node(bstats, rate_est) != NULL; |
| 325 | spin_unlock(&est_tree_lock); | 325 | spin_unlock_bh(&est_tree_lock); |
| 326 | 326 | ||
| 327 | return res; | 327 | return res; |
| 328 | } | 328 | } |
