git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
[pandora-kernel.git]
/
arch
/
x86
/
net
/
bpf_jit_comp.c
diff --git
a/arch/x86/net/bpf_jit_comp.c
b/arch/x86/net/bpf_jit_comp.c
index
bfab3fa
..
7b65f75
100644
(file)
--- a/
arch/x86/net/bpf_jit_comp.c
+++ b/
arch/x86/net/bpf_jit_comp.c
@@
-568,8
+568,8
@@
cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
break;
}
if (filter[i].jt != 0) {
break;
}
if (filter[i].jt != 0) {
- if (filter[i].jf)
- t_offset += is_near(f_offset) ? 2 :
6
;
+ if (filter[i].jf
&& f_offset
)
+ t_offset += is_near(f_offset) ? 2 :
5
;
EMIT_COND_JMP(t_op, t_offset);
if (filter[i].jf)
EMIT_JMP(f_offset);
EMIT_COND_JMP(t_op, t_offset);
if (filter[i].jf)
EMIT_JMP(f_offset);