diff options
| author | Simon Horman <horms@verge.net.au> | 2008-08-16 00:44:17 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-08-16 00:44:17 -0400 |
| commit | 51df1901394a714d1a17202da02ae4957260eab5 (patch) | |
| tree | 952d76cf7186dd6099d40f4204e0df7b9539e8fc /net/sched | |
| parent | 4a031b0e6acd8a8c23725ceb5db6a0aa5c4e231f (diff) | |
| parent | 23197916c447a1623d196e6547781180905f0bb2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index d2b6f54a6261..5cafdd4c8018 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -280,7 +280,7 @@ replay: | |||
| 280 | if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) { | 280 | if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) { |
| 281 | spin_lock_bh(root_lock); | 281 | spin_lock_bh(root_lock); |
| 282 | *back = tp->next; | 282 | *back = tp->next; |
| 283 | spin_lock_bh(root_lock); | 283 | spin_unlock_bh(root_lock); |
| 284 | 284 | ||
| 285 | tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER); | 285 | tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER); |
| 286 | tcf_destroy(tp); | 286 | tcf_destroy(tp); |