summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2010-09-08 09:16:28 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-10 12:47:59 -0700
commit9ca7f8762299bb391c11a81c844224216e925b5c (patch)
treef4e3b114727a1fef133dd617c37d816da46703d3 /net
parenta034ee3cca5726b14107f281f4bed1c0fd44472a (diff)
downloadlinux-3.10-9ca7f8762299bb391c11a81c844224216e925b5c.tar.gz
linux-3.10-9ca7f8762299bb391c11a81c844224216e925b5c.tar.bz2
linux-3.10-9ca7f8762299bb391c11a81c844224216e925b5c.zip
pkt_sched: remov unnecessary bh_disable
Now that est_tree_lock is acquired with BH protection, the other call is unnecessary. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/gen_estimator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index 6743146e4d6..7c2373321b7 100644
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -274,9 +274,9 @@ void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
while ((e = gen_find_node(bstats, rate_est))) {
rb_erase(&e->node, &est_root);
- write_lock_bh(&est_lock);
+ write_lock(&est_lock);
e->bstats = NULL;
- write_unlock_bh(&est_lock);
+ write_unlock(&est_lock);
list_del_rcu(&e->list);
call_rcu(&e->e_rcu, __gen_kill_estimator);