projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
[firefly-linux-kernel-4.4.55.git]
/
net
/
sched
/
cls_api.c
diff --git
a/net/sched/cls_api.c
b/net/sched/cls_api.c
index 77147c8c4acc01ea3a0f7c19b30720ee7ad987d3..aad6a679fb135e9c6492a1b1cd3c1b638d823453 100644
(file)
--- a/
net/sched/cls_api.c
+++ b/
net/sched/cls_api.c
@@
-549,6
+549,7
@@
void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
tcf_tree_lock(tp);
list_splice_init(&dst->actions, &tmp);
list_splice(&src->actions, &dst->actions);
+ dst->type = src->type;
tcf_tree_unlock(tp);
tcf_action_destroy(&tmp, TCA_ACT_UNBIND);
#endif