diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /cyw43/src/control.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'cyw43/src/control.rs')
| -rw-r--r-- | cyw43/src/control.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cyw43/src/control.rs b/cyw43/src/control.rs index 6919d569e..c67614dd6 100644 --- a/cyw43/src/control.rs +++ b/cyw43/src/control.rs | |||
| @@ -381,10 +381,7 @@ impl<'a> Control<'a> { | |||
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | let ioctl = CancelOnDrop(self.ioctl_state); | 383 | let ioctl = CancelOnDrop(self.ioctl_state); |
| 384 | 384 | let resp_len = ioctl.0.do_ioctl(kind, cmd, iface, buf).await; | |
| 385 | ioctl.0.do_ioctl(kind, cmd, iface, buf).await; | ||
| 386 | let resp_len = ioctl.0.wait_complete().await; | ||
| 387 | |||
| 388 | ioctl.defuse(); | 385 | ioctl.defuse(); |
| 389 | 386 | ||
| 390 | resp_len | 387 | resp_len |