git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[sfrench/cifs-2.6.git]
/
net
/
sched
/
cls_u32.c
diff --git
a/net/sched/cls_u32.c
b/net/sched/cls_u32.c
index 05d178008cbc9046d682f2bc2dbc01ce1e85737b..07372f60bee3364588cb94fcfcad1cc7bee514e5 100644
(file)
--- 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,
break;
n->next = *ins;
-
wmb(
);
+
tcf_tree_lock(tp
);
*ins = n;
+ tcf_tree_unlock(tp);
*arg = (unsigned long)n;
return 0;