Message ID | 20140924163839.GA6925@zenon.in.qult.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
(Cc'ing Thomas) On Wed, Sep 24, 2014 at 9:38 AM, Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr> wrote: > Negated expressions and sub-expressions need to have their flags checked for > TCF_EM_INVERT and their result negated accordingly. > > Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr> > --- > net/sched/ematch.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/sched/ematch.c b/net/sched/ematch.c > index 3a633de..ad57f44 100644 > --- a/net/sched/ematch.c > +++ b/net/sched/ematch.c > @@ -526,9 +526,11 @@ pop_stack: > match_idx = stack[--stackp]; > cur_match = tcf_em_get_match(tree, match_idx); > > - if (tcf_em_early_end(cur_match, res)) > + if (tcf_em_early_end(cur_match, res)) { > + if (tcf_em_is_inverted(cur_match)) > + res = !res; > goto pop_stack; > - else { > + } else { > match_idx++; > goto proceed; > } > -- > 1.9.1 > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr> Date: Wed, 24 Sep 2014 18:38:39 +0200 > Negated expressions and sub-expressions need to have their flags checked for > TCF_EM_INVERT and their result negated accordingly. > > Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index 3a633de..ad57f44 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c @@ -526,9 +526,11 @@ pop_stack: match_idx = stack[--stackp]; cur_match = tcf_em_get_match(tree, match_idx); - if (tcf_em_early_end(cur_match, res)) + if (tcf_em_early_end(cur_match, res)) { + if (tcf_em_is_inverted(cur_match)) + res = !res; goto pop_stack; - else { + } else { match_idx++; goto proceed; }
Negated expressions and sub-expressions need to have their flags checked for TCF_EM_INVERT and their result negated accordingly. Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr> --- net/sched/ematch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)