[nrf fromtree] Bluetooth: Mesh: Fix Capabilities Status message with OOB upload enabled

PavelVPV · cvinayak · commit c60135ad3ca0 · 2023-10-16T12:48:46.000+02:00
The `else` case was incorrectly excluded by preprocessor. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> (cherry picked from commit 5cf6218) Signed-off-by: Alperen Şener <alperen.sener@nordicsemi.no>
diff --git a/subsys/bluetooth/mesh/dfd_srv.c b/subsys/bluetooth/mesh/dfd_srv.c
@@ -233,11 +233,10 @@ static int handle_capabilities_get(struct bt_mesh_model *mod, struct bt_mesh_msg
 		net_buf_simple_add_mem(&rsp, srv->oob_schemes.schemes,
 				       srv->oob_schemes.count);
 	} else
-#else
+#endif
 	{
 		net_buf_simple_add_u8(&rsp, 0);
 	}
-#endif
 
 	bt_mesh_model_send(mod, ctx, &rsp, NULL, NULL);
 

Original file line number	Diff line number	Diff line change
`@@ -233,11 +233,10 @@ static int handle_capabilities_get(struct bt_mesh_model *mod, struct bt_mesh_msg`
`233`	`233`	`net_buf_simple_add_mem(&rsp, srv->oob_schemes.schemes,`
`234`	`234`	`srv->oob_schemes.count);`
`235`	`235`	`} else`
`236`		`-#else`
	`236`	`+#endif`
`237`	`237`	`{`
`238`	`238`	`net_buf_simple_add_u8(&rsp, 0);`
`239`	`239`	`}`
`240`		`-#endif`
`241`	`240`
`242`	`241`	`bt_mesh_model_send(mod, ctx, &rsp, NULL, NULL);`
`243`	`242`