Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
net
/
sched
/
cls_flow.c
diff --git
a/kernel/net/sched/cls_flow.c
b/kernel/net/sched/cls_flow.c
index
a620c4e
..
75df923
100644
(file)
--- a/
kernel/net/sched/cls_flow.c
+++ b/
kernel/net/sched/cls_flow.c
@@
-419,6
+419,8
@@
static int flow_change(struct net *net, struct sk_buff *in_skb,
if (!fnew)
goto err2;
if (!fnew)
goto err2;
+ tcf_exts_init(&fnew->exts, TCA_FLOW_ACT, TCA_FLOW_POLICE);
+
fold = (struct flow_filter *)*arg;
if (fold) {
err = -EINVAL;
fold = (struct flow_filter *)*arg;
if (fold) {
err = -EINVAL;
@@
-480,7
+482,6
@@
static int flow_change(struct net *net, struct sk_buff *in_skb,
fnew->mask = ~0U;
fnew->tp = tp;
get_random_bytes(&fnew->hashrnd, 4);
fnew->mask = ~0U;
fnew->tp = tp;
get_random_bytes(&fnew->hashrnd, 4);
- tcf_exts_init(&fnew->exts, TCA_FLOW_ACT, TCA_FLOW_POLICE);
}
fnew->perturb_timer.function = flow_perturbation;
}
fnew->perturb_timer.function = flow_perturbation;
@@
-520,7
+521,7
@@
static int flow_change(struct net *net, struct sk_buff *in_skb,
if (*arg == 0)
list_add_tail_rcu(&fnew->list, &head->filters);
else
if (*arg == 0)
list_add_tail_rcu(&fnew->list, &head->filters);
else
- list_replace_rcu(&f
new->list, &fold
->list);
+ list_replace_rcu(&f
old->list, &fnew
->list);
*arg = (unsigned long)fnew;
*arg = (unsigned long)fnew;