summaryrefslogtreecommitdiffstats
path: root/net/sched/ematch.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-10-08 16:22:22 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-08 16:22:22 -0400
commit64b1f00a0830e1c53874067273a096b228d83d36 (patch)
treedd547b0f1d431d0995b8eaa711cedb92399f31fe /net/sched/ematch.c
parent16b99a4f6644d58c94acb4b4253e84049de588c5 (diff)
parent5301e3e117d88ef0967ce278912e54757f1a31a2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sched/ematch.c')
-rw-r--r--net/sched/ematch.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 8250c36543d8..6742200b1307 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -528,9 +528,10 @@ pop_stack:
528 match_idx = stack[--stackp]; 528 match_idx = stack[--stackp];
529 cur_match = tcf_em_get_match(tree, match_idx); 529 cur_match = tcf_em_get_match(tree, match_idx);
530 530
531 if (tcf_em_is_inverted(cur_match))
532 res = !res;
533
531 if (tcf_em_early_end(cur_match, res)) { 534 if (tcf_em_early_end(cur_match, res)) {
532 if (tcf_em_is_inverted(cur_match))
533 res = !res;
534 goto pop_stack; 535 goto pop_stack;
535 } else { 536 } else {
536 match_idx++; 537 match_idx++;