diff options
| author | Wolfram Sang <wsa@kernel.org> | 2020-05-20 15:27:45 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-05-20 15:27:45 +0200 |
| commit | f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a (patch) | |
| tree | 31a5967da1f04180a1a922258f6947ad17255ee8 /net/xdp/xsk.c | |
| parent | i2c: core: support bus regulator controlling in adapter (diff) | |
| parent | MAINTAINERS: add maintainer for mediatek i2c controller driver (diff) | |
| download | linux-f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a.tar.xz linux-f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a.zip | |
Merge branch 'i2c/for-current-fixed' into i2c/for-5.8
Diffstat (limited to 'net/xdp/xsk.c')
| -rw-r--r-- | net/xdp/xsk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 356f90e4522b..c350108aa38d 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -131,8 +131,9 @@ static void __xsk_rcv_memcpy(struct xdp_umem *umem, u64 addr, void *from_buf, u64 page_start = addr & ~(PAGE_SIZE - 1); u64 first_len = PAGE_SIZE - (addr - page_start); - memcpy(to_buf, from_buf, first_len + metalen); - memcpy(next_pg_addr, from_buf + first_len, len - first_len); + memcpy(to_buf, from_buf, first_len); + memcpy(next_pg_addr, from_buf + first_len, + len + metalen - first_len); return; } |