diff options
| -rw-r--r-- | net/sched/act_api.c | 8 | ||||
| -rw-r--r-- | net/sched/act_police.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index feef366cad5d..72cdb0fade20 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -68,7 +68,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb, | |||
| 68 | int err = 0, index = -1,i = 0, s_i = 0, n_i = 0; | 68 | int err = 0, index = -1,i = 0, s_i = 0, n_i = 0; |
| 69 | struct rtattr *r ; | 69 | struct rtattr *r ; |
| 70 | 70 | ||
| 71 | read_lock(hinfo->lock); | 71 | read_lock_bh(hinfo->lock); |
| 72 | 72 | ||
| 73 | s_i = cb->args[0]; | 73 | s_i = cb->args[0]; |
| 74 | 74 | ||
| @@ -96,7 +96,7 @@ static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb, | |||
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | done: | 98 | done: |
| 99 | read_unlock(hinfo->lock); | 99 | read_unlock_bh(hinfo->lock); |
| 100 | if (n_i) | 100 | if (n_i) |
| 101 | cb->args[0] += n_i; | 101 | cb->args[0] += n_i; |
| 102 | return n_i; | 102 | return n_i; |
| @@ -156,13 +156,13 @@ struct tcf_common *tcf_hash_lookup(u32 index, struct tcf_hashinfo *hinfo) | |||
| 156 | { | 156 | { |
| 157 | struct tcf_common *p; | 157 | struct tcf_common *p; |
| 158 | 158 | ||
| 159 | read_lock(hinfo->lock); | 159 | read_lock_bh(hinfo->lock); |
| 160 | for (p = hinfo->htab[tcf_hash(index, hinfo->hmask)]; p; | 160 | for (p = hinfo->htab[tcf_hash(index, hinfo->hmask)]; p; |
| 161 | p = p->tcfc_next) { | 161 | p = p->tcfc_next) { |
| 162 | if (p->tcfc_index == index) | 162 | if (p->tcfc_index == index) |
| 163 | break; | 163 | break; |
| 164 | } | 164 | } |
| 165 | read_unlock(hinfo->lock); | 165 | read_unlock_bh(hinfo->lock); |
| 166 | 166 | ||
| 167 | return p; | 167 | return p; |
| 168 | } | 168 | } |
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 6085be578459..17f6f27e28a2 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
| @@ -56,7 +56,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c | |||
| 56 | int err = 0, index = -1, i = 0, s_i = 0, n_i = 0; | 56 | int err = 0, index = -1, i = 0, s_i = 0, n_i = 0; |
| 57 | struct rtattr *r; | 57 | struct rtattr *r; |
| 58 | 58 | ||
| 59 | read_lock(&police_lock); | 59 | read_lock_bh(&police_lock); |
| 60 | 60 | ||
| 61 | s_i = cb->args[0]; | 61 | s_i = cb->args[0]; |
| 62 | 62 | ||
| @@ -85,7 +85,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c | |||
| 85 | } | 85 | } |
| 86 | } | 86 | } |
| 87 | done: | 87 | done: |
| 88 | read_unlock(&police_lock); | 88 | read_unlock_bh(&police_lock); |
| 89 | if (n_i) | 89 | if (n_i) |
| 90 | cb->args[0] += n_i; | 90 | cb->args[0] += n_i; |
| 91 | return n_i; | 91 | return n_i; |
