diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-12-11 20:12:36 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-12-11 22:29:38 -0800 |
| commit | 46d5e62dd3c34770f3bfd0642daa9a7772a00362 (patch) | |
| tree | 72f00a33d177cae0c8c9d7337ced3a6c6bbad45d /arch/sparc | |
| parent | 91163f82143630a9629a8bf0227d49173697c69c (diff) | |
| parent | 7f376f1917d7461e05b648983e8d2aea9d0712b2 (diff) | |
| download | linux-46d5e62dd3c34770f3bfd0642daa9a7772a00362.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
xdp_return_frame_bulk() needs to pass a xdp_buff
to __xdp_return().
strlcpy got converted to strscpy but here it makes no
functional difference, so just keep the right code.
Conflicts:
net/netfilter/nf_tables_api.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/lib/csum_copy.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/csum_copy.S b/arch/sparc/lib/csum_copy.S index 0c0268e77155..d839956407a7 100644 --- a/arch/sparc/lib/csum_copy.S +++ b/arch/sparc/lib/csum_copy.S @@ -71,7 +71,7 @@ FUNC_NAME: /* %o0=src, %o1=dst, %o2=len */ LOAD(prefetch, %o0 + 0x000, #n_reads) xor %o0, %o1, %g1 - mov 1, %o3 + mov -1, %o3 clr %o4 andcc %g1, 0x3, %g0 bne,pn %icc, 95f |