diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 02:28:45 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 02:28:45 +0300 |
| commit | 3118e6e19da7b8d76b2456b880c74a9aa3a2268b (patch) | |
| tree | 3060d11297c1195ef2d1f120d9c2247b4b1de4ae /arch/s390 | |
| parent | feca7d8c135bc1527b244fe817b8b6498066ccec (diff) | |
| parent | 48fb6f4db940e92cfb16cd878cddd59ea6120d06 (diff) | |
| download | linux-3118e6e19da7b8d76b2456b880c74a9aa3a2268b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.
The TCP conflict was a case of local variables in a function
being removed from both net and net-next.
In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 01c6fbc3e85b..1803797fc885 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -1253,7 +1253,8 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp) insn_count = bpf_jit_insn(jit, fp, i); if (insn_count < 0) return -1; - jit->addrs[i + 1] = jit->prg; /* Next instruction address */ + /* Next instruction address */ + jit->addrs[i + insn_count] = jit->prg; } bpf_jit_epilogue(jit); |