diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /net/sched/cls_u32.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'net/sched/cls_u32.c')
| -rw-r--r-- | net/sched/cls_u32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 05d178008cbc..07372f60bee3 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c | |||
| @@ -638,8 +638,9 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, | |||
| 638 | break; | 638 | break; |
| 639 | 639 | ||
| 640 | n->next = *ins; | 640 | n->next = *ins; |
| 641 | wmb(); | 641 | tcf_tree_lock(tp); |
| 642 | *ins = n; | 642 | *ins = n; |
| 643 | tcf_tree_unlock(tp); | ||
| 643 | 644 | ||
| 644 | *arg = (unsigned long)n; | 645 | *arg = (unsigned long)n; |
| 645 | return 0; | 646 | return 0; |