tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstre…

…am base
intel-lab-lkp · Jun 14, 2024 · 15e92c8 · 15e92c8
2 parents d91c2f2 + 4fd8fa2
commit 15e92c8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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;