diff options
| author |  Aryan Srivastava <aryan.srivastava@alliedtelesis.co.nz>
| 2024-06-13 14:49:00 +1200 |
|---|---|---|
| committer |  Jakub Kicinski <kuba@kernel.org>
| 2024-06-13 16:50:16 -0700 |
| commit | 4467c09bc7a66a17ffd84d6262d48279b26106ea (patch) | |
| tree | 9e0310c3ca4bb68b076f2e8ae7975f80f9ad5d7d /drivers/net/ethernet/marvell | |
| parent | Merge tag 'net-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-4467c09bc7a66a17ffd84d6262d48279b26106ea.tar.gz linux-4467c09bc7a66a17ffd84d6262d48279b26106ea.tar.bz2 linux-4467c09bc7a66a17ffd84d6262d48279b26106ea.zip | |
net: mvpp2: use slab_build_skb for oversized frames
Setting frag_size to 0 to indicate kmalloc has been deprecated,
use slab_build_skb directly.
Fixes: ce098da1497c ("skbuff: Introduce slab_build_skb()")
Signed-off-by: Aryan Srivastava <aryan.srivastava@alliedtelesis.co.nz>
Reviewed-by: Kees Cook <kees@kernel.org>
Link: https://lore.kernel.org/r/20240613024900.3842238-1-aryan.srivastava@alliedtelesis.co.nz
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index e91486c48de3..671368d2c77e 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -4014,7 +4014,10 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, } } - skb = build_skb(data, frag_size); + if (frag_size) + skb = build_skb(data, frag_size); + else + skb = slab_build_skb(data); if (!skb) { netdev_warn(port->dev, "skb build failed\n"); goto err_drop_frame; |